Fixed 'duplicate extension' issue (#1191)

Fixed 'duplicate extension' issue
eclipse-birt · Feb 3, 2023 · 24af10e · 24af10e
1 parent f5cb70e
commit 24af10e
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"/>