From 24af10e820c42c71e9bbf824071c298f46da5665 Mon Sep 17 00:00:00 2001
From: Priytosh Tripathi <priytosh.revolution@live.com>
Date: Fri, 3 Feb 2023 19:01:17 +0530
Subject: [PATCH] Fixed 'duplicate extension' issue (#1191)

Fixed 'duplicate extension' issue
---
 build/org.eclipse.birt.target/BIRT Chart Test.launch     | 1 -
 build/org.eclipse.birt.target/BIRT Model Test.launch     | 1 -
 build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch | 1 -
 build/org.eclipse.birt.target/BIRT all-in-one.launch     | 1 -
 tutorial/extension-tutorial-1/plugin.xml                 | 1 -
 tutorial/extension-tutorial-2/plugin.xml                 | 5 ++---
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/build/org.eclipse.birt.target/BIRT Chart Test.launch b/build/org.eclipse.birt.target/BIRT Chart Test.launch
index 716052b1396..0212b277ae2 100644
--- a/build/org.eclipse.birt.target/BIRT Chart Test.launch	
+++ b/build/org.eclipse.birt.target/BIRT Chart Test.launch	
@@ -917,7 +917,6 @@
         <setEntry value="org.eclipse.birt.report.engine.testhelper@default:false"/>
         <setEntry value="org.eclipse.birt.report.engine.tests@default:default"/>
         <setEntry value="org.eclipse.birt.report.engine@default:default"/>
-        <setEntry value="org.eclipse.birt.report.extension.tutorial_1@default:default"/>
         <setEntry value="org.eclipse.birt.report.extension.tutorial_2@default:default"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core.nl1@default:false"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core.tests@default:false"/>
diff --git a/build/org.eclipse.birt.target/BIRT Model Test.launch b/build/org.eclipse.birt.target/BIRT Model Test.launch
index e49ed92de09..32657c6d550 100644
--- a/build/org.eclipse.birt.target/BIRT Model Test.launch	
+++ b/build/org.eclipse.birt.target/BIRT Model Test.launch	
@@ -907,7 +907,6 @@
         <setEntry value="org.eclipse.birt.report.engine.testhelper@default:false"/>
         <setEntry value="org.eclipse.birt.report.engine.tests@default:default"/>
         <setEntry value="org.eclipse.birt.report.engine@default:default"/>
-        <setEntry value="org.eclipse.birt.report.extension.tutorial_1@default:default"/>
         <setEntry value="org.eclipse.birt.report.extension.tutorial_2@default:default"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core.nl1@default:false"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core.tests@default:false"/>
diff --git a/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch b/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch
index b825030bb24..ec76ba76d2c 100644
--- a/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch	
+++ b/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch	
@@ -845,7 +845,6 @@
         <setEntry value="org.eclipse.birt.report.engine.ooxml@default:default"/>
         <setEntry value="org.eclipse.birt.report.engine.script.javascript@default:default"/>
         <setEntry value="org.eclipse.birt.report.engine@default:default"/>
-        <setEntry value="org.eclipse.birt.report.extension.tutorial_1@default:default"/>
         <setEntry value="org.eclipse.birt.report.extension.tutorial_2@default:default"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core.nl1@default:false"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core@default:default"/>
diff --git a/build/org.eclipse.birt.target/BIRT all-in-one.launch b/build/org.eclipse.birt.target/BIRT all-in-one.launch
index 8dc2a6829a7..b87cf2986dc 100644
--- a/build/org.eclipse.birt.target/BIRT all-in-one.launch	
+++ b/build/org.eclipse.birt.target/BIRT all-in-one.launch	
@@ -915,7 +915,6 @@
         <setEntry value="org.eclipse.birt.report.engine.script.javascript@default:default"/>
         <setEntry value="org.eclipse.birt.report.engine.testhelper@default:false"/>
         <setEntry value="org.eclipse.birt.report.engine@default:default"/>
-        <setEntry value="org.eclipse.birt.report.extension.tutorial_1@default:default"/>
         <setEntry value="org.eclipse.birt.report.extension.tutorial_2@default:default"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core.nl1@default:false"/>
         <setEntry value="org.eclipse.birt.report.item.crosstab.core@default:default"/>
diff --git a/tutorial/extension-tutorial-1/plugin.xml b/tutorial/extension-tutorial-1/plugin.xml
index cb83c1e21e4..c0cce6426eb 100644
--- a/tutorial/extension-tutorial-1/plugin.xml
+++ b/tutorial/extension-tutorial-1/plugin.xml
@@ -32,7 +32,6 @@
                type="string"/>
       </reportItem>
    </extension>
-
      <extension
          point="org.eclipse.birt.report.designer.ui.reportitemUI">
       <model extensionName="RotatedText"/>
diff --git a/tutorial/extension-tutorial-2/plugin.xml b/tutorial/extension-tutorial-2/plugin.xml
index 6c3086d709e..a4aa2d84f3e 100644
--- a/tutorial/extension-tutorial-2/plugin.xml
+++ b/tutorial/extension-tutorial-2/plugin.xml
@@ -14,7 +14,7 @@
  *   See git history
  *******************************************************************************
 -->
-<plugin>
+<plugin> 
    <extension
          point="org.eclipse.birt.report.model.reportItemModel">
       <reportItem
@@ -32,8 +32,7 @@
                type="expression"/>
       </reportItem>
    </extension>
-
-     <extension
+   <extension
          point="org.eclipse.birt.report.designer.ui.reportitemUI">
       <model extensionName="RotatedText"/>
       <palette icon="icons/rotatedtext.jpg"/>