svn commit: r1781219 [5/14] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/groovyScripts/ap/invoices/ applications/accounting/groovyScripts/fixedasset/ applications/accounting/groovyScripts/invoice/ applications/accounting/gro...

Propchange: ofbiz/trunk/plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/webapp/accounting/WEB-INF/controller.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/webapp/accounting/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml?rev=1781219&r1=1781218&r2=1781219&view=diff
==============================================================================
--- ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml Wed Feb  1 10:58:46 2017
@@ -1,291 +1,291 @@
-<?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.
--->
-
-<web-app version="3.0">
-    <display-name>Apache OFBiz - BIRT Component</display-name>
-    <description>BIRT Component of the Apache OFBiz Project</description>
-    
-    <context-param>
-        <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
-        <param-name>localDispatcherName</param-name><param-value>birt</param-value>
-    </context-param>    
-    <context-param>
-        <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
-        <param-name>entityDelegatorName</param-name><param-value>default</param-value>
-    </context-param>
-    <context-param>
-        <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
-        <param-name>mainDecoratorLocation</param-name>
-        <param-value>component://birt/widget/birt/BirtScreens.xml</param-value>
-    </context-param>
-    <context-param>
-        <description>Enable widget boundary comments. See org.apache.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
-        <param-name>widgetVerbose</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>Remove unnecessary whitespace from HTML output.</description>
-        <param-name>compressHTML</param-name>
-        <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}/plugins/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>
-        <filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
-        <init-param>
-            <param-name>allowedPaths</param-name>
-            <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/frameset:/run:/preview:/download:/parameter:/document:/output:/extract:/webcontent:/CancelTask.jsp</param-value>
-        </init-param>
-        <init-param>
-            <param-name>redirectPath</param-name>
-            <param-value>/control/main</param-value>
-        </init-param>
-    </filter>
-    <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        <filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>ControlFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ContextFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
-    <listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
-    <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
-    <!-- <listener><listener-class>org.apache.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
-
-    <!-- Viewer HttpSession Listener -->
-    <listener>
-        <listener-class>org.eclipse.birt.report.listener.ViewerHttpSessionListener</listener-class>
-    </listener>
-  
-    <servlet>
-        <description>Main Control Servlet</description>
-        <display-name>ControlServlet</display-name>
-        <servlet-name>ControlServlet</servlet-name>
-        <servlet-class>org.apache.ofbiz.webapp.control.ControlServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <!-- Viewer Servlet, Supports SOAP -->
-    <servlet>
-        <servlet-name>ViewerServlet</servlet-name>
-        <servlet-class>org.apache.ofbiz.birt.report.servlet.BirtViewerServlet</servlet-class>
-    </servlet>
-    <!-- Engine Servlet -->
-    <servlet>
-        <servlet-name>EngineServlet</servlet-name>
-        <servlet-class>org.apache.ofbiz.birt.report.servlet.BirtEngineServlet</servlet-class>
-    </servlet>
-    <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>ViewerServlet</servlet-name>
-        <url-pattern>/frameset</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>ViewerServlet</servlet-name>
-        <url-pattern>/run</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>EngineServlet</servlet-name>
-        <url-pattern>/preview</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>EngineServlet</servlet-name>
-        <url-pattern>/download</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>EngineServlet</servlet-name>
-        <url-pattern>/parameter</url-pattern>
-    </servlet-mapping>  
-
-    <servlet-mapping>
-        <servlet-name>EngineServlet</servlet-name>
-        <url-pattern>/document</url-pattern>
-    </servlet-mapping>  
-
-    <servlet-mapping>
-        <servlet-name>EngineServlet</servlet-name>
-        <url-pattern>/output</url-pattern>
-    </servlet-mapping>  
-    
-    <servlet-mapping>
-        <servlet-name>EngineServlet</servlet-name>
-        <url-pattern>/extract</url-pattern>
-    </servlet-mapping>
-
-    <session-config>
-        <session-timeout>60</session-timeout><!-- in minutes -->
-        <cookie-config>
-          <http-only>true</http-only>
-          <secure>true</secure>
-        </cookie-config>
-        <tracking-mode>COOKIE</tracking-mode>
-    </session-config>
-
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-        <welcome-file>index.html</welcome-file>
-        <welcome-file>index.htm</welcome-file>
-    </welcome-file-list>
-</web-app>
+<?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.
+-->
+
+<web-app version="3.0">
+    <display-name>Apache OFBiz - BIRT Component</display-name>
+    <description>BIRT Component of the Apache OFBiz Project</description>
+    
+    <context-param>
+        <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+        <param-name>localDispatcherName</param-name><param-value>birt</param-value>
+    </context-param>    
+    <context-param>
+        <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+        <param-name>entityDelegatorName</param-name><param-value>default</param-value>
+    </context-param>
+    <context-param>
+        <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+        <param-name>mainDecoratorLocation</param-name>
+        <param-value>component://birt/widget/birt/BirtScreens.xml</param-value>
+    </context-param>
+    <context-param>
+        <description>Enable widget boundary comments. See org.apache.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
+        <param-name>widgetVerbose</param-name>
+        <param-value>false</param-value>
+    </context-param>
+    <context-param>
+        <description>Remove unnecessary whitespace from HTML output.</description>
+        <param-name>compressHTML</param-name>
+        <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}/plugins/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>
+        <filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
+        <init-param>
+            <param-name>allowedPaths</param-name>
+            <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/frameset:/run:/preview:/download:/parameter:/document:/output:/extract:/webcontent:/CancelTask.jsp</param-value>
+        </init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        <filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
+    <listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
+    <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
+    <!-- <listener><listener-class>org.apache.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
+
+    <!-- Viewer HttpSession Listener -->
+    <listener>
+        <listener-class>org.eclipse.birt.report.listener.ViewerHttpSessionListener</listener-class>
+    </listener>
+  
+    <servlet>
+        <description>Main Control Servlet</description>
+        <display-name>ControlServlet</display-name>
+        <servlet-name>ControlServlet</servlet-name>
+        <servlet-class>org.apache.ofbiz.webapp.control.ControlServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <!-- Viewer Servlet, Supports SOAP -->
+    <servlet>
+        <servlet-name>ViewerServlet</servlet-name>
+        <servlet-class>org.apache.ofbiz.birt.report.servlet.BirtViewerServlet</servlet-class>
+    </servlet>
+    <!-- Engine Servlet -->
+    <servlet>
+        <servlet-name>EngineServlet</servlet-name>
+        <servlet-class>org.apache.ofbiz.birt.report.servlet.BirtEngineServlet</servlet-class>
+    </servlet>
+    <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>ViewerServlet</servlet-name>
+        <url-pattern>/frameset</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>ViewerServlet</servlet-name>
+        <url-pattern>/run</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>EngineServlet</servlet-name>
+        <url-pattern>/preview</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>EngineServlet</servlet-name>
+        <url-pattern>/download</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>EngineServlet</servlet-name>
+        <url-pattern>/parameter</url-pattern>
+    </servlet-mapping>  
+
+    <servlet-mapping>
+        <servlet-name>EngineServlet</servlet-name>
+        <url-pattern>/document</url-pattern>
+    </servlet-mapping>  
+
+    <servlet-mapping>
+        <servlet-name>EngineServlet</servlet-name>
+        <url-pattern>/output</url-pattern>
+    </servlet-mapping>  
+    
+    <servlet-mapping>
+        <servlet-name>EngineServlet</servlet-name>
+        <url-pattern>/extract</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout><!-- in minutes -->
+        <cookie-config>
+          <http-only>true</http-only>
+          <secure>true</secure>
+        </cookie-config>
+        <tracking-mode>COOKIE</tracking-mode>
+    </session-config>
+
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+        <welcome-file>index.htm</welcome-file>
+    </welcome-file-list>
+</web-app>

Propchange: ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/webapp/facility/WEB-INF/controller.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/webapp/ordermgr/WEB-INF/controller.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/webapp/ordermgr/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/accounting/AccountingForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/accounting/AccountingScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/trunk/plugins/birt/widget/birt/BirtForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/widget/birt/BirtForms.xml?rev=1781219&r1=1781218&r2=1781219&view=diff
==============================================================================
--- ofbiz/trunk/plugins/birt/widget/birt/BirtForms.xml (original)
+++ ofbiz/trunk/plugins/birt/widget/birt/BirtForms.xml Wed Feb  1 10:58:46 2017
@@ -1,145 +1,145 @@
-<?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"
-        xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form 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="birtContentType">
-            <drop-down>
-                <entity-options entity-name="Enumeration" description="${enumCode}" key-field-name="description">
-                    <entity-constraint name="enumTypeId" value="FLEXIBLE_BIRT"/>
-                    <entity-order-by field-name="sequenceId"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="attachmentName" required-field="true"><text/></field>
-        <field name="birtReportLocation" tooltip="Example is component://birt/webapp/birt/report/example.rptdesign" required-field="true"><text/></field>
-        <field name="sendButton"><submit/></field>
-    </form>
-
-    <!-- Flexible Report Form -->
-    <form name="CreateFlexibleReport" type="single" target="CreateFlexibleReport">
-        <field name="contentId" title="${uiLabelMap.BirtSelectMasterFlexibleReport}" >
-            <drop-down>
-                <entity-options description="${description}" entity-name="Content" key-field-name="contentId">
-                    <entity-constraint name="contentTypeId" value="REPORT_MASTER" />
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="reportName" required-field="true"><text/></field>
-        <field name="description" required-field="true"><text /></field>
-        <field name="writeFilters"><check/></field>
-        <field name="sendButton"><submit/></field>
-    </form>
-    <form name="ListPublishFlexibleReport" type="single" target="DisplayFlexibleReportSearchForm">
-        <field name="contentId" title="${uiLabelMap.BirtSelectFlexibleReport}" >
-            <drop-down>
-                <entity-options description="[${contentName}] ${description}" entity-name="ContentAssocViewTo" key-field-name="contentId">
-                    <entity-constraint name="contentTypeId" value="FLEXIBLE_REPORT" />
-                    <entity-constraint name="statusId" value="CTNT_PUBLISHED"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="sendButton"><submit /></field>
-    </form>
-
-    <form name="EditFlexibleReport" type="single" target="UpdateFlexibleReport" default-map-name="content">
-        <field name="contentId"><hidden/></field>
-        <field name="contentName" title="${uiLabelMap.FormFieldTitle_reportName}"><display/></field>
-        <field name="description"><text/></field>
-        <field name="statusId">
-            <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem">
-                    <entity-constraint name="statusId" operator="in" value="CTNT_PUBLISHED,CTNT_IN_PROGRESS"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field>
-    </form>
-    <form name="UploadRptDesign" type="upload" target="UploadRptDesign">
-        <actions>
-            <entity-and entity-name="ContentAssoc" use-cache="true" list="contentAssocs">
-                <field-map field-name="contentId" from-field="content.contentId"/>
-            </entity-and>
-            <set field="contentAssoc" from-field="contentAssocs[0]" type="Object"/>
-            <entity-one entity-name="Content" value-field="contentRpt">
-                <field-map from-field="contentAssoc.contentIdTo" field-name="contentId"/>
-            </entity-one>
-        </actions>
-        <field name="contentId"><hidden value="${content.contentId}"/></field>
-        <field name="dataResourceIdRpt"><hidden value="${contentRpt.dataResourceId}"/></field>
-        <field name="downloadRptDesignLink" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.BirtDownloadRptDesign}" target="ViewBinaryDataResource" target-window="_blank">
-                <parameter param-name="dataResourceId" from-field="contentRpt.dataResourceId"/>
-            </hyperlink>
-        </field>
-        <field name="uploadRptDesign" title=" "><file/></field>
-        <field name="upload" title="${uiLabelMap.CommonUpload}" position="2"><submit/></field>
-    </form>
-
-    <form name="EditFlexibleReportSearchForm" type="single" target="EditFlexibleReportSearchForm">
-        <actions>
-            <set field="statusId" from-field="content.statusId"/>
-            <set field="reportContentId" from-field="content.contentId"/>
-            <entity-and entity-name="ContentAssoc" list="masterContent">
-                <field-map field-name="contentIdTo" from-field="contentId"/>
-                <field-map field-name="contentAssocTypeId" value="SUB_CONTENT"/>
-            </entity-and>
-            <service service-name="prepareFlexibleReportSearchFormToEdit" auto-field-map="true" result-map="displayFormMap"/>
-        </actions>
-        <field name="overrideFilters" title=" "><textarea cols="90" rows="20" default-value="${displayFormMap.textForm}"/></field>
-        <field name="reportContentId"><hidden/></field>
-        <field name="saveButton" title="${uiLabelMap.CommonSave}"><submit/></field>
-        <on-event-update-area event-type="submit" area-id="preview-column" area-target="PreviewReportSearchForm">
-            <parameter param-name="contentId" value="${contentId}"/>
-        </on-event-update-area>
-    </form>
-
-    <form name="ListFlexibleReport" type="list" target="" odd-row-style="alternate-row" list-name="contentTypeReport" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-        <row-actions>
-            <entity-one entity-name="Content" value-field="content" />
-            <set field="contentId" from-field="content.contentId"/>
-            <entity-and entity-name="ContentAssoc" use-cache="true" list="contentAssocs">
-                <field-map field-name="contentId"/>
-            </entity-and>
-            <set field="contentAssoc" from-field="contentAssocs[0]" type="Object"/>
-            <entity-one entity-name="Content" value-field="contentRpt">
-                <field-map from-field="contentAssoc.contentIdTo" field-name="contentId"/>
-            </entity-one>
-            <entity-and entity-name="ContentAssoc" use-cache="true" list="masterContentAssocs">
-                <field-map field-name="contentIdTo" from-field="contentId"/>
-            </entity-and>
-            <set field="masterContentAssoc" from-field="masterContentAssocs[0]" type="Object"/>
-            <entity-one entity-name="Content" value-field="masterContent">
-                <field-map from-field="masterContentAssoc.contentId" field-name="contentId"/>
-            </entity-one>
-        </row-actions>
-        <field name="contentName" sort-field="true"><display/></field>
-        <field name="masterContentName" sort-field="true" map-name="masterContent" entry-name="contentName"><display /></field>
-        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" /></field>
-        <field name="description" sort-field="true"><display/></field>
-        <field name="manageLink"><include-menu name="ListFlexibleBirtAction" location="component://birt/widget/birt/BirtMenus.xml"/></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"
+        xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form 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="birtContentType">
+            <drop-down>
+                <entity-options entity-name="Enumeration" description="${enumCode}" key-field-name="description">
+                    <entity-constraint name="enumTypeId" value="FLEXIBLE_BIRT"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="attachmentName" required-field="true"><text/></field>
+        <field name="birtReportLocation" tooltip="Example is component://birt/webapp/birt/report/example.rptdesign" required-field="true"><text/></field>
+        <field name="sendButton"><submit/></field>
+    </form>
+
+    <!-- Flexible Report Form -->
+    <form name="CreateFlexibleReport" type="single" target="CreateFlexibleReport">
+        <field name="contentId" title="${uiLabelMap.BirtSelectMasterFlexibleReport}" >
+            <drop-down>
+                <entity-options description="${description}" entity-name="Content" key-field-name="contentId">
+                    <entity-constraint name="contentTypeId" value="REPORT_MASTER" />
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="reportName" required-field="true"><text/></field>
+        <field name="description" required-field="true"><text /></field>
+        <field name="writeFilters"><check/></field>
+        <field name="sendButton"><submit/></field>
+    </form>
+    <form name="ListPublishFlexibleReport" type="single" target="DisplayFlexibleReportSearchForm">
+        <field name="contentId" title="${uiLabelMap.BirtSelectFlexibleReport}" >
+            <drop-down>
+                <entity-options description="[${contentName}] ${description}" entity-name="ContentAssocViewTo" key-field-name="contentId">
+                    <entity-constraint name="contentTypeId" value="FLEXIBLE_REPORT" />
+                    <entity-constraint name="statusId" value="CTNT_PUBLISHED"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="sendButton"><submit /></field>
+    </form>
+
+    <form name="EditFlexibleReport" type="single" target="UpdateFlexibleReport" default-map-name="content">
+        <field name="contentId"><hidden/></field>
+        <field name="contentName" title="${uiLabelMap.FormFieldTitle_reportName}"><display/></field>
+        <field name="description"><text/></field>
+        <field name="statusId">
+            <drop-down>
+                <entity-options description="${description}" entity-name="StatusItem">
+                    <entity-constraint name="statusId" operator="in" value="CTNT_PUBLISHED,CTNT_IN_PROGRESS"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field>
+    </form>
+    <form name="UploadRptDesign" type="upload" target="UploadRptDesign">
+        <actions>
+            <entity-and entity-name="ContentAssoc" use-cache="true" list="contentAssocs">
+                <field-map field-name="contentId" from-field="content.contentId"/>
+            </entity-and>
+            <set field="contentAssoc" from-field="contentAssocs[0]" type="Object"/>
+            <entity-one entity-name="Content" value-field="contentRpt">
+                <field-map from-field="contentAssoc.contentIdTo" field-name="contentId"/>
+            </entity-one>
+        </actions>
+        <field name="contentId"><hidden value="${content.contentId}"/></field>
+        <field name="dataResourceIdRpt"><hidden value="${contentRpt.dataResourceId}"/></field>
+        <field name="downloadRptDesignLink" title=" " widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${uiLabelMap.BirtDownloadRptDesign}" target="ViewBinaryDataResource" target-window="_blank">
+                <parameter param-name="dataResourceId" from-field="contentRpt.dataResourceId"/>
+            </hyperlink>
+        </field>
+        <field name="uploadRptDesign" title=" "><file/></field>
+        <field name="upload" title="${uiLabelMap.CommonUpload}" position="2"><submit/></field>
+    </form>
+
+    <form name="EditFlexibleReportSearchForm" type="single" target="EditFlexibleReportSearchForm">
+        <actions>
+            <set field="statusId" from-field="content.statusId"/>
+            <set field="reportContentId" from-field="content.contentId"/>
+            <entity-and entity-name="ContentAssoc" list="masterContent">
+                <field-map field-name="contentIdTo" from-field="contentId"/>
+                <field-map field-name="contentAssocTypeId" value="SUB_CONTENT"/>
+            </entity-and>
+            <service service-name="prepareFlexibleReportSearchFormToEdit" auto-field-map="true" result-map="displayFormMap"/>
+        </actions>
+        <field name="overrideFilters" title=" "><textarea cols="90" rows="20" default-value="${displayFormMap.textForm}"/></field>
+        <field name="reportContentId"><hidden/></field>
+        <field name="saveButton" title="${uiLabelMap.CommonSave}"><submit/></field>
+        <on-event-update-area event-type="submit" area-id="preview-column" area-target="PreviewReportSearchForm">
+            <parameter param-name="contentId" value="${contentId}"/>
+        </on-event-update-area>
+    </form>
+
+    <form name="ListFlexibleReport" type="list" target="" odd-row-style="alternate-row" list-name="contentTypeReport" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <entity-one entity-name="Content" value-field="content" />
+            <set field="contentId" from-field="content.contentId"/>
+            <entity-and entity-name="ContentAssoc" use-cache="true" list="contentAssocs">
+                <field-map field-name="contentId"/>
+            </entity-and>
+            <set field="contentAssoc" from-field="contentAssocs[0]" type="Object"/>
+            <entity-one entity-name="Content" value-field="contentRpt">
+                <field-map from-field="contentAssoc.contentIdTo" field-name="contentId"/>
+            </entity-one>
+            <entity-and entity-name="ContentAssoc" use-cache="true" list="masterContentAssocs">
+                <field-map field-name="contentIdTo" from-field="contentId"/>
+            </entity-and>
+            <set field="masterContentAssoc" from-field="masterContentAssocs[0]" type="Object"/>
+            <entity-one entity-name="Content" value-field="masterContent">
+                <field-map from-field="masterContentAssoc.contentId" field-name="contentId"/>
+            </entity-one>
+        </row-actions>
+        <field name="contentName" sort-field="true"><display/></field>
+        <field name="masterContentName" sort-field="true" map-name="masterContent" entry-name="contentName"><display /></field>
+        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" /></field>
+        <field name="description" sort-field="true"><display/></field>
+        <field name="manageLink"><include-menu name="ListFlexibleBirtAction" location="component://birt/widget/birt/BirtMenus.xml"/></field>
+  </form>
+
+</forms>

Propchange: ofbiz/trunk/plugins/birt/widget/birt/BirtForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/birt/BirtMasterForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/birt/BirtMenus.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: ofbiz/trunk/plugins/birt/widget/birt/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/widget/birt/BirtScreens.xml?rev=1781219&r1=1781218&r2=1781219&view=diff
==============================================================================
--- ofbiz/trunk/plugins/birt/widget/birt/BirtScreens.xml (original)
+++ ofbiz/trunk/plugins/birt/widget/birt/BirtScreens.xml Wed Feb  1 10:58:46 2017
@@ -1,417 +1,417 @@
-<?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="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="CommonBirtDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="Birt"/>
-                <set field="subcomponentMenuName" from-field="subcomponentMenuName" default-value="BirtTabBar" />
-                <set field="subcomponentMenuLocation" from-field="subcomponentMenuLocation" default-value="component://birt/widget/birt/BirtMenus.xml" />
-            </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="${subcomponentMenuName}" location="${subcomponentMenuLocation}"/>
-                            </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="CommonBirtMinimalDecorator">
-        <section>
-            <actions>
-                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-            </actions>
-            <widgets>
-                <decorator-section-include name="body"/>
-            </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>
-
-    <!--=========================-->
-    <!--  Flexible Birt Screen   -->
-    <!--=========================-->
-    <screen name="CommonFlexibleBirtDecorator">
-        <section>
-            <actions>
-                <set field="subcomponentMenuLocation" value="component://birt/widget/birt/BirtMenus.xml"/>
-                <set field="subcomponentMenuName" value="FlexibleBirtTabBar"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-section-include name="body"/>
-                    </decorator-section>
-                </decorator-screen>
-
-            </widgets>
-        </section>
-    </screen>
-    <screen name="UseFlexibleReport">
-        <section>
-            <actions>
-               <set field="tabButtonItem" value="UseFlexibleReport" />
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFlexibleBirtDecorator">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission permission="BIRT" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <include-screen name="SelectFlexibleReport"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="SelectFlexibleReport">
-        <section>
-            <condition>
-                <if-has-permission permission="BIRT" action="_VIEW"/>
-<!--                 <if-service-permission service-name="genericBirtPermission" main-action="VIEW"/> -->
-            </condition>
-            <actions>
-                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true" />
-                <set field="contentEntityNameView" from-field="contentEntityNameView" default-value=""/>
-            </actions>
-            <widgets>
-                <screenlet title="${uiLabelMap.BirtSelectFlexibleReport}">
-                    <include-form location="component://birt/widget/birt/BirtForms.xml" name="ListPublishFlexibleReport" />
-                </screenlet>
-            </widgets>
-            <fail-widgets>
-                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
-            </fail-widgets>
-        </section>
-    </screen>
-
-    <screen name="ListFlexibleReport">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="ListFlexibleReport" />
-                <set field="sortField" from-field="parameters.sortField" default-value="contentName"/>
-                <entity-and entity-name="Content" use-cache="true" list="contentTypeReport">
-                    <field-map field-name="contentTypeId" value="FLEXIBLE_REPORT"/>
-                    <order-by field-name="${sortField}"/>
-                </entity-and>
-                <service service-name="genericBirtPermission" result-map="permCreateResult">
-                    <field-map field-name="mainAction" value="CREATE"/>
-                </service>
-                <set field="hasCreatePermission" from-field="permCreateResult.hasPermission"/>
-    
-                <service service-name="genericBirtPermission" result-map="permDeleteResult">
-                    <field-map field-name="mainAction" value="DELETE"/>
-                </service>
-                <set field="hasDeletePermission" from-field="permDeleteResult.hasPermission"/>
-    
-                <service service-name="genericBirtPermission" result-map="permUpdateResult">
-                    <field-map field-name="mainAction" value="UPDATE"/>
-                </service>
-                <set field="hasUpdatePermission" from-field="permUpdateResult.hasPermission"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFlexibleBirtDecorator">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <or>
-                                    <if-has-permission permission="BIRT" action="_DELETE"/>
-                                    <if-has-permission permission="BIRT" action="_CREATE"/>
-                                    <if-has-permission permission="BIRT" action="_UPDATE"/>
-                                </or>
-                            </condition>
-                            <widgets>
-                                <container style="button-bar">
-                                    <link target="SelectMasterFlexibleReport" text="${uiLabelMap.BirtFlexibleReportGeneration}" style="buttontext create"/>
-                                </container>
-                                <screenlet title="${uiLabelMap.BirtFlexibleReportManagement}">
-                                    <section>
-                                        <condition>
-                                            <not><if-empty field="contentTypeReport"/></not>
-                                        </condition>
-                                        <widgets>
-                                            <include-form location="component://birt/widget/birt/BirtForms.xml" name="ListFlexibleReport" />
-                                        </widgets>
-                                        <fail-widgets>
-                                            <label text="${uiLabelMap.BirtNoKnownFlexibleReport}"/>
-                                        </fail-widgets>
-                                    </section>
-                                </screenlet>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="CreateFlexibleReport">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="SelectMasterFlexibleReport" />
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFlexibleBirtDecorator">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission permission="BIRT" action="_CREATE"/>
-                            </condition>
-                            <widgets>
-                                <screenlet title="${uiLabelMap.BirtSelectMasterFlexibleReport}">
-                                    <include-form location="component://birt/widget/birt/BirtForms.xml" name="CreateFlexibleReport" />
-                                </screenlet>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditFlexibleReport">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="manageReport" />
-                <set field="contentId" from-field="parameters.reportContentId" default-value="${parameters.contentId}"/>
-                <entity-one entity-name="Content" value-field="content"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonFlexibleBirtDecorator">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <or>
-                                    <if-has-permission permission="BIRT" action="_CREATE"/>
-                                    <if-has-permission permission="BIRT" action="_UPDATE"/>
-                                </or>
-                            </condition>
-                            <widgets>
-                                <container id="edit-column" style="lefthalf">
-                                    <screenlet title="${uiLabelMap.BirtEditFlexibleReport}">
-                                        <label style="h2">${uiLabelMap.BirtFlexibleReportInformation}</label>
-                                        <include-form name="EditFlexibleReport" location="component://birt/widget/birt/BirtForms.xml"/>
-                                        <label style="h2">${uiLabelMap.BirtUploadRptDesign}</label>
-                                        <include-form name="UploadRptDesign" location="component://birt/widget/birt/BirtForms.xml" />
-                                        <label style="h2">${uiLabelMap.BirtOverrideFilters}</label>
-                                        <include-form name="EditFlexibleReportSearchForm" location="component://birt/widget/birt/BirtForms.xml"/>
-                                    </screenlet>
-                                </container>
-                                <container id="preview-column" style="righthalf">
-                                    <include-screen name="PreviewReportSearchForm"/>
-                                </container>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="DisplayFlexibleReportSearchForm">
-        <section>
-            <widgets>
-                <decorator-screen name="CommonFlexibleBirtDecorator">
-                    <decorator-section name="body">
-                        <include-screen name="PreviewReportSearchForm"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="PreviewReportSearchForm">
-        <section>
-            <actions>
-                <entity-one entity-name="Content" value-field="content" use-cache="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonBirtMinimalDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.CommonPreview}" id="content-form-preview">
-                            <content content-id="${content.contentId}"/>
-                        </screenlet>
-                    </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="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="CommonBirtDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="Birt"/>
+                <set field="subcomponentMenuName" from-field="subcomponentMenuName" default-value="BirtTabBar" />
+                <set field="subcomponentMenuLocation" from-field="subcomponentMenuLocation" default-value="component://birt/widget/birt/BirtMenus.xml" />
+            </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="${subcomponentMenuName}" location="${subcomponentMenuLocation}"/>
+                            </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="CommonBirtMinimalDecorator">
+        <section>
+            <actions>
+                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
+            <widgets>
+                <decorator-section-include name="body"/>
+            </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>
+
+    <!--=========================-->
+    <!--  Flexible Birt Screen   -->
+    <!--=========================-->
+    <screen name="CommonFlexibleBirtDecorator">
+        <section>
+            <actions>
+                <set field="subcomponentMenuLocation" value="component://birt/widget/birt/BirtMenus.xml"/>
+                <set field="subcomponentMenuName" value="FlexibleBirtTabBar"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+
+            </widgets>
+        </section>
+    </screen>
+    <screen name="UseFlexibleReport">
+        <section>
+            <actions>
+               <set field="tabButtonItem" value="UseFlexibleReport" />
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFlexibleBirtDecorator">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-has-permission permission="BIRT" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <include-screen name="SelectFlexibleReport"/>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="SelectFlexibleReport">
+        <section>
+            <condition>
+                <if-has-permission permission="BIRT" action="_VIEW"/>
+<!--                 <if-service-permission service-name="genericBirtPermission" main-action="VIEW"/> -->
+            </condition>
+            <actions>
+                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true" />
+                <set field="contentEntityNameView" from-field="contentEntityNameView" default-value=""/>
+            </actions>
+            <widgets>
+                <screenlet title="${uiLabelMap.BirtSelectFlexibleReport}">
+                    <include-form location="component://birt/widget/birt/BirtForms.xml" name="ListPublishFlexibleReport" />
+                </screenlet>
+            </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
+            </fail-widgets>
+        </section>
+    </screen>
+
+    <screen name="ListFlexibleReport">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="ListFlexibleReport" />
+                <set field="sortField" from-field="parameters.sortField" default-value="contentName"/>
+                <entity-and entity-name="Content" use-cache="true" list="contentTypeReport">
+                    <field-map field-name="contentTypeId" value="FLEXIBLE_REPORT"/>
+                    <order-by field-name="${sortField}"/>
+                </entity-and>
+                <service service-name="genericBirtPermission" result-map="permCreateResult">
+                    <field-map field-name="mainAction" value="CREATE"/>
+                </service>
+                <set field="hasCreatePermission" from-field="permCreateResult.hasPermission"/>
+    
+                <service service-name="genericBirtPermission" result-map="permDeleteResult">
+                    <field-map field-name="mainAction" value="DELETE"/>
+                </service>
+                <set field="hasDeletePermission" from-field="permDeleteResult.hasPermission"/>
+    
+                <service service-name="genericBirtPermission" result-map="permUpdateResult">
+                    <field-map field-name="mainAction" value="UPDATE"/>
+                </service>
+                <set field="hasUpdatePermission" from-field="permUpdateResult.hasPermission"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFlexibleBirtDecorator">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <or>
+                                    <if-has-permission permission="BIRT" action="_DELETE"/>
+                                    <if-has-permission permission="BIRT" action="_CREATE"/>
+                                    <if-has-permission permission="BIRT" action="_UPDATE"/>
+                                </or>
+                            </condition>
+                            <widgets>
+                                <container style="button-bar">
+                                    <link target="SelectMasterFlexibleReport" text="${uiLabelMap.BirtFlexibleReportGeneration}" style="buttontext create"/>
+                                </container>
+                                <screenlet title="${uiLabelMap.BirtFlexibleReportManagement}">
+                                    <section>
+                                        <condition>
+                                            <not><if-empty field="contentTypeReport"/></not>
+                                        </condition>
+                                        <widgets>
+                                            <include-form location="component://birt/widget/birt/BirtForms.xml" name="ListFlexibleReport" />
+                                        </widgets>
+                                        <fail-widgets>
+                                            <label text="${uiLabelMap.BirtNoKnownFlexibleReport}"/>
+                                        </fail-widgets>
+                                    </section>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="CreateFlexibleReport">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="SelectMasterFlexibleReport" />
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFlexibleBirtDecorator">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <if-has-permission permission="BIRT" action="_CREATE"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.BirtSelectMasterFlexibleReport}">
+                                    <include-form location="component://birt/widget/birt/BirtForms.xml" name="CreateFlexibleReport" />
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditFlexibleReport">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="manageReport" />
+                <set field="contentId" from-field="parameters.reportContentId" default-value="${parameters.contentId}"/>
+                <entity-one entity-name="Content" value-field="content"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFlexibleBirtDecorator">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <or>
+                                    <if-has-permission permission="BIRT" action="_CREATE"/>
+                                    <if-has-permission permission="BIRT" action="_UPDATE"/>
+                                </or>
+                            </condition>
+                            <widgets>
+                                <container id="edit-column" style="lefthalf">
+                                    <screenlet title="${uiLabelMap.BirtEditFlexibleReport}">
+                                        <label style="h2">${uiLabelMap.BirtFlexibleReportInformation}</label>
+                                        <include-form name="EditFlexibleReport" location="component://birt/widget/birt/BirtForms.xml"/>
+                                        <label style="h2">${uiLabelMap.BirtUploadRptDesign}</label>
+                                        <include-form name="UploadRptDesign" location="component://birt/widget/birt/BirtForms.xml" />
+                                        <label style="h2">${uiLabelMap.BirtOverrideFilters}</label>
+                                        <include-form name="EditFlexibleReportSearchForm" location="component://birt/widget/birt/BirtForms.xml"/>
+                                    </screenlet>
+                                </container>
+                                <container id="preview-column" style="righthalf">
+                                    <include-screen name="PreviewReportSearchForm"/>
+                                </container>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.BirtPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="DisplayFlexibleReportSearchForm">
+        <section>
+            <widgets>
+                <decorator-screen name="CommonFlexibleBirtDecorator">
+                    <decorator-section name="body">
+                        <include-screen name="PreviewReportSearchForm"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="PreviewReportSearchForm">
+        <section>
+            <actions>
+                <entity-one entity-name="Content" value-field="content" use-cache="true"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonBirtMinimalDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.CommonPreview}" id="content-form-preview">
+                            <content content-id="${content.contentId}"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>

Propchange: ofbiz/trunk/plugins/birt/widget/birt/BirtScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/facility/FacilityForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/facility/FacilityScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/order/OrderForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/birt/widget/order/OrderScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/cmssite/data/CmsMultiSiteDemoData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/config/EbayStoreUiLabels.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/DemoEbayStoreData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/EbayStoreHelpData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/EbayStorePortletData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/EbayStoreSecurityGroupDemoData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/EbayStoreTypeData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_AutoPref.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_BlockItemOutStock.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_EbayStore.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/plugins/ebaystore/data/helpdata/HELP_EBAY_Feedback.xml
------------------------------------------------------------------------------
    svn:eol-style = native