From 61f062f242ad7cbaf48e33eac373c2fbf8d7d55b Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Wed, 31 May 2023 18:22:00 +0200
Subject: [PATCH] Fix messed up nsURI

https://github.com/eclipse-datatools/datatools/issues/1
---
 .../model/DesignXML.xsd                                     | 2 +-
 .../org.eclipse.datatools.connectivity.oda.design.ecore     | 2 +-
 .../plugin.xml                                              | 2 +-
 .../datatools/connectivity/oda/design/DesignPackage.java    | 2 +-
 .../connectivity/oda/design/impl/DesignFactoryImpl.java     | 2 +-
 .../oda/design/tests/DesignUtilLoadSaveTest.java            | 2 +-
 .../testFiles/golden/BirtSampleResourceSession.xml          | 6 +++---
 .../testFiles/golden/jdbcBirtSampleSession.xml              | 2 +-
 .../golden/jdbcBirtSampleSession_multDefValues.xml          | 2 +-
 .../golden/jdbcBirtSampleSession_multDefValues_out.xml      | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd
index 439758d8d..82422d134 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns:design="https://www.eclipse.org/datatools/connectivity/oda/design" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="https://www.eclipse.org/datatools/connectivity/oda/design">
+<xsd:schema xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.eclipse.org/datatools/connectivity/oda/design">
   <xsd:simpleType name="AxisType">
     <xsd:annotation>
       <xsd:documentation>Axis type of a result set column.</xsd:documentation>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore
index 81f5ab503..c55c020bd 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="design"
-    nsURI="https://www.eclipse.org/datatools/connectivity/oda/design" nsPrefix="design">
+    nsURI="http://www.eclipse.org/datatools/connectivity/oda/design" nsPrefix="design">
   <eClassifiers xsi:type="ecore:EClass" name="AndExpression" eSuperTypes="#//CompositeFilterExpression">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A built-in composite filter expression whose child expressions are combined by the And boolean operator.  The composite expression is evaluated to be true only if all its child expressions are evaluated as true.  "/>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.xml
index f8e49b656..14abfdf3a 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.xml
@@ -22,7 +22,7 @@
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
-       uri = "https://www.eclipse.org/datatools/connectivity/oda/design" 
+       uri = "http://www.eclipse.org/datatools/connectivity/oda/design" 
        class = "org.eclipse.datatools.connectivity.oda.design.DesignPackage" />
   </extension>
 
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java
index f1d968168..e676fd714 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java
@@ -60,7 +60,7 @@ public interface DesignPackage extends EPackage
      * <!-- end-user-doc -->
      * @generated
      */
-    String eNS_URI = "https://www.eclipse.org/datatools/connectivity/oda/design"; //$NON-NLS-1$
+    String eNS_URI = "http://www.eclipse.org/datatools/connectivity/oda/design"; //$NON-NLS-1$
 
     /**
      * The package namespace name.
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java
index 580ff2b1d..b68b3e7d8 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java
@@ -119,7 +119,7 @@ public static DesignFactory init()
         try
         {
             DesignFactory theDesignFactory = (DesignFactory) EPackage.Registry.INSTANCE
-                    .getEFactory( "https://www.eclipse.org/datatools/connectivity/oda/design" ); //$NON-NLS-1$ 
+                    .getEFactory( "http://www.eclipse.org/datatools/connectivity/oda/design" ); //$NON-NLS-1$ 
             if( theDesignFactory != null )
             {
                 return theDesignFactory;
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java b/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java
index 2fe8173bd..5f9c269cc 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java
@@ -155,7 +155,7 @@ public void testSaveDesignSession()
     
     public void testAddOptionalResourceIDElement()
     {
-        String odaDesignURIString = "https://www.eclipse.org/datatools/connectivity/oda/design"; //$NON-NLS-1$
+        String odaDesignURIString = "http://www.eclipse.org/datatools/connectivity/oda/design"; //$NON-NLS-1$
         URI odaDesignURI = null;
         try
         {
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/BirtSampleResourceSession.xml b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/BirtSampleResourceSession.xml
index 877ef48bc..53ababcc0 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/BirtSampleResourceSession.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/BirtSampleResourceSession.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="https://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="https://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
+<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="http://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
   <design:request>
     <design:dataAccessDesign>
       <design:dataSetDesign>
@@ -49,8 +49,8 @@
             </design:properties>
           </design:publicProperties>
           <design:hostResourceIdentifiers>
-            <design:applResourceBaseURIString>https://www.eclipse.org/datatools/connectivity/oda/design</design:applResourceBaseURIString>
-            <design:designResourceBaseURIString>https://www.eclipse.org/datatools/connectivity/oda/design</design:designResourceBaseURIString>
+            <design:applResourceBaseURIString>http://www.eclipse.org/datatools/connectivity/oda/design</design:applResourceBaseURIString>
+            <design:designResourceBaseURIString>http://www.eclipse.org/datatools/connectivity/oda/design</design:designResourceBaseURIString>
           </design:hostResourceIdentifiers>
         </design:dataSourceDesign>
         <design:query>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession.xml b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession.xml
index 18c12d667..2d1ccc171 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="https://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="https://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
+<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="http://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
   <design:request>
     <design:dataAccessDesign>
       <design:dataSetDesign>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues.xml b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues.xml
index d5b1cc07c..1a7a7b53e 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="https://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="https://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
+<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="http://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
   <design:request>
     <design:dataAccessDesign>
       <design:dataSetDesign>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues_out.xml b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues_out.xml
index f89714ceb..748061d45 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues_out.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/testFiles/golden/jdbcBirtSampleSession_multDefValues_out.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="https://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="https://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
+<design:odaDesignSession xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xsi:schemaLocation="http://www.eclipse.org/datatools/connectivity/oda/design java://org.eclipse.datatools.connectivity.oda.design.DesignPackage">
   <design:request>
     <design:dataAccessDesign>
       <design:dataSetDesign>