From 38373469096902b47b768b6d7e167789f042798f Mon Sep 17 00:00:00 2001
From: Steve Schafer <sschafer@innoventsolutions.com>
Date: Fri, 9 Apr 2021 17:36:02 -0600
Subject: [PATCH] change org.eclipse.jdt.core.compiler.codegen.targetPlatform,
 org.eclipse.jdt.core.compiler.compliance, and
 org.eclipse.jdt.core.compiler.source from 11 to 1.8 I didn't change the
 .classpath, web.xml, or pom.xml files. I think eclipse did it when I use it
 to reformat all the code. Anyway, it builds now and I'm not touching it.

---
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 copy-settings                                 |   7 +
 .../.classpath                                |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../.classpath                                |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 pom.xml                                       |  31 ---
 .../birt/WEB-INF/web.xml                      | 248 +++++++++---------
 10 files changed, 148 insertions(+), 172 deletions(-)

diff --git a/build/org.eclipse.birt.build/.settings/org.eclipse.jdt.core.prefs b/build/org.eclipse.birt.build/.settings/org.eclipse.jdt.core.prefs
index e906f3c0a07..889eb43948b 100644
--- a/build/org.eclipse.birt.build/.settings/org.eclipse.jdt.core.prefs
+++ b/build/org.eclipse.birt.build/.settings/org.eclipse.jdt.core.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -70,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/build/org.eclipse.birt.releng.util/.settings/org.eclipse.jdt.core.prefs b/build/org.eclipse.birt.releng.util/.settings/org.eclipse.jdt.core.prefs
index e906f3c0a07..889eb43948b 100644
--- a/build/org.eclipse.birt.releng.util/.settings/org.eclipse.jdt.core.prefs
+++ b/build/org.eclipse.birt.releng.util/.settings/org.eclipse.jdt.core.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -70,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/copy-settings b/copy-settings
index d3d4586d477..bdcbf952ee5 100755
--- a/copy-settings
+++ b/copy-settings
@@ -44,6 +44,13 @@ do
 			done
 		fi
 		cp -r $HOME/git/eclipse.platform.ui/bundles/org.eclipse.ui/.settings "$dir"
+		#use java 1.8 instead of java 11
+		# was 11
+		addLine "$dir/.settings/org.eclipse.jdt.core.prefs" "org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8"
+		# was 11
+		addLine "$dir/.settings/org.eclipse.jdt.core.prefs" "org.eclipse.jdt.core.compiler.compliance=1.8"
+		# was 11
+		addLine "$dir/.settings/org.eclipse.jdt.core.prefs" "org.eclipse.jdt.core.compiler.source=1.8"
 		#copy back previous settings
 		if [ -d "/tmp/previous-settings" ]
 		then
diff --git a/nl/org.eclipse.birt.chart.device.extension.nl/.classpath b/nl/org.eclipse.birt.chart.device.extension.nl/.classpath
index d116359246e..bc57d2383d5 100644
--- a/nl/org.eclipse.birt.chart.device.extension.nl/.classpath
+++ b/nl/org.eclipse.birt.chart.device.extension.nl/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/nl/org.eclipse.birt.chart.device.extension.nl/.settings/org.eclipse.jdt.core.prefs b/nl/org.eclipse.birt.chart.device.extension.nl/.settings/org.eclipse.jdt.core.prefs
index 9d180b99cc1..e906f3c0a07 100644
--- a/nl/org.eclipse.birt.chart.device.extension.nl/.settings/org.eclipse.jdt.core.prefs
+++ b/nl/org.eclipse.birt.chart.device.extension.nl/.settings/org.eclipse.jdt.core.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=15
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=15
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -70,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=15
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/nl/org.eclipse.birt.chart.device.svg.nl/.classpath b/nl/org.eclipse.birt.chart.device.svg.nl/.classpath
index d116359246e..bc57d2383d5 100644
--- a/nl/org.eclipse.birt.chart.device.svg.nl/.classpath
+++ b/nl/org.eclipse.birt.chart.device.svg.nl/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/nl/org.eclipse.birt.chart.device.svg.nl/.settings/org.eclipse.jdt.core.prefs b/nl/org.eclipse.birt.chart.device.svg.nl/.settings/org.eclipse.jdt.core.prefs
index 9d180b99cc1..e906f3c0a07 100644
--- a/nl/org.eclipse.birt.chart.device.svg.nl/.settings/org.eclipse.jdt.core.prefs
+++ b/nl/org.eclipse.birt.chart.device.svg.nl/.settings/org.eclipse.jdt.core.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=15
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=15
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -70,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=15
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/nl/org.eclipse.birt.data.oda.pojo.ui.nl/.settings/org.eclipse.jdt.core.prefs b/nl/org.eclipse.birt.data.oda.pojo.ui.nl/.settings/org.eclipse.jdt.core.prefs
index d9a08284e62..98bd25d4f6f 100644
--- a/nl/org.eclipse.birt.data.oda.pojo.ui.nl/.settings/org.eclipse.jdt.core.prefs
+++ b/nl/org.eclipse.birt.data.oda.pojo.ui.nl/.settings/org.eclipse.jdt.core.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -70,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/pom.xml b/pom.xml
index 133288e2e56..eeeb93eae17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,37 +336,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-antrun-plugin
-										</artifactId>
-										<versionRange>
-											[1.8,)
-										</versionRange>
-										<goals>
-											<goal>run</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 
diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/web.xml b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/web.xml
index c0fce26f375..4fdc90ba483 100644
--- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/web.xml
+++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/web.xml
@@ -252,8 +252,8 @@ description, distributable, and context-param elements.
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.index_jsp</servlet-name>
-        <servlet-class>jsp.index_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.common.Locale_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.common.Locale_jsp</servlet-class>
     </servlet>
 
     <servlet>
@@ -267,153 +267,153 @@ description, distributable, and context-param elements.
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.common.Locale_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.common.Locale_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.common.processing_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.common.processing_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.common.processing_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.common.processing_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.ParameterGroupFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.parameter.ParameterGroupFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.control.NavigationbarFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.control.NavigationbarFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.ComboBoxParameterFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.parameter.ComboBoxParameterFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.control.ProgressBarFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.control.ProgressBarFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.RadioButtonParameterFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.parameter.RadioButtonParameterFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.control.TocFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.control.TocFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.TextBoxParameterFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.parameter.TextBoxParameterFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.control.ToolbarFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.control.ToolbarFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.HiddenParameterFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.parameter.HiddenParameterFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ConfirmationDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.ConfirmationDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.CheckboxParameterFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.parameter.CheckboxParameterFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.DialogContainerFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.DialogContainerFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.RequesterFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.RequesterFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ExceptionDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.ExceptionDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ParameterFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.ParameterFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportDataDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.ExportDataDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.DocumentFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.DocumentFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportReportDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.ExportReportDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.RunFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.RunFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ParameterDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.ParameterDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ReportContentFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.ReportContentFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.PrintReportDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.SidebarFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.SidebarFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportServerDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.PrintReportServerDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ReportFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.ReportFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.SimpleExportDataDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.dialog.SimpleExportDataDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.FramesetFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.FramesetFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.DocumentFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.DocumentFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ReportDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.layout.ReportDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.FramesetFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.FramesetFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.control.ProgressBarFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.control.ProgressBarFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ParameterFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.ParameterFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.control.ToolbarFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.control.ToolbarFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ReportContentFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.ReportContentFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.control.NavigationbarFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.control.NavigationbarFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ReportDialogFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.ReportDialogFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.control.TocFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.control.TocFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ReportFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.ReportFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.PrintReportDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.RequesterFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.RequesterFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.SimpleExportDataDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.SimpleExportDataDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.RunFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.RunFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.DialogContainerFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.DialogContainerFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.layout.SidebarFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.layout.SidebarFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ExceptionDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.ExceptionDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.CheckboxParameterFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.parameter.CheckboxParameterFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ParameterDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.ParameterDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.ComboBoxParameterFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.parameter.ComboBoxParameterFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportServerDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.PrintReportServerDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.HiddenParameterFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.parameter.HiddenParameterFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportDataDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.ExportDataDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.ParameterGroupFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.parameter.ParameterGroupFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportReportDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.ExportReportDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.RadioButtonParameterFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.parameter.RadioButtonParameterFragment_jsp</servlet-class>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ConfirmationDialogFragment_jsp</servlet-name>
+        <servlet-class>jsp.webcontent.birt.pages.dialog.ConfirmationDialogFragment_jsp</servlet-class>
     </servlet>
 
     <servlet>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.TextBoxParameterFragment_jsp</servlet-name>
-        <servlet-class>jsp.webcontent.birt.pages.parameter.TextBoxParameterFragment_jsp</servlet-class>
+        <servlet-name>jsp.index_jsp</servlet-name>
+        <servlet-class>jsp.index_jsp</servlet-class>
     </servlet>
 
     <servlet-mapping>
@@ -422,8 +422,8 @@ description, distributable, and context-param elements.
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.index_jsp</servlet-name>
-        <url-pattern>/index.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.common.Locale_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/common/Locale.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
@@ -437,153 +437,153 @@ description, distributable, and context-param elements.
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.common.Locale_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/common/Locale.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.common.processing_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/common/processing.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.common.processing_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/common/processing.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.ParameterGroupFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/parameter/ParameterGroupFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.control.NavigationbarFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/control/NavigationbarFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.ComboBoxParameterFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/parameter/ComboBoxParameterFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.control.ProgressBarFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/control/ProgressBarFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.RadioButtonParameterFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/parameter/RadioButtonParameterFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.control.TocFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/control/TocFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.TextBoxParameterFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/parameter/TextBoxParameterFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.control.ToolbarFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/control/ToolbarFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.HiddenParameterFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/parameter/HiddenParameterFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ConfirmationDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/ConfirmationDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.parameter.CheckboxParameterFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/parameter/CheckboxParameterFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.DialogContainerFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/DialogContainerFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.RequesterFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/RequesterFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ExceptionDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/ExceptionDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ParameterFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/ParameterFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportDataDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/ExportDataDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.DocumentFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/DocumentFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportReportDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/ExportReportDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.RunFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/RunFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.ParameterDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/ParameterDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ReportContentFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/ReportContentFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/PrintReportDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.SidebarFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/SidebarFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportServerDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/PrintReportServerDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ReportFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/ReportFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.dialog.SimpleExportDataDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/dialog/SimpleExportDataDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.FramesetFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/FramesetFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.DocumentFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/DocumentFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.layout.ReportDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/layout/ReportDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.FramesetFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/FramesetFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.control.ProgressBarFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/control/ProgressBarFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ParameterFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/ParameterFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.control.ToolbarFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/control/ToolbarFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ReportContentFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/ReportContentFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.control.NavigationbarFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/control/NavigationbarFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ReportDialogFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/ReportDialogFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.control.TocFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/control/TocFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.ReportFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/ReportFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/PrintReportDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.RequesterFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/RequesterFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.SimpleExportDataDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/SimpleExportDataDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.RunFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/RunFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.DialogContainerFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/DialogContainerFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.layout.SidebarFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/layout/SidebarFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ExceptionDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/ExceptionDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.CheckboxParameterFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/parameter/CheckboxParameterFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ParameterDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/ParameterDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.ComboBoxParameterFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/parameter/ComboBoxParameterFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.PrintReportServerDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/PrintReportServerDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.HiddenParameterFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/parameter/HiddenParameterFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportDataDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/ExportDataDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.ParameterGroupFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/parameter/ParameterGroupFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ExportReportDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/ExportReportDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.RadioButtonParameterFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/parameter/RadioButtonParameterFragment.jsp</url-pattern>
+        <servlet-name>jsp.webcontent.birt.pages.dialog.ConfirmationDialogFragment_jsp</servlet-name>
+        <url-pattern>/webcontent/birt/pages/dialog/ConfirmationDialogFragment.jsp</url-pattern>
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>jsp.webcontent.birt.pages.parameter.TextBoxParameterFragment_jsp</servlet-name>
-        <url-pattern>/webcontent/birt/pages/parameter/TextBoxParameterFragment.jsp</url-pattern>
+        <servlet-name>jsp.index_jsp</servlet-name>
+        <url-pattern>/index.jsp</url-pattern>
     </servlet-mapping>
 
 <!--