MAGETWO-43452: Ogre sprint 38 contribution to mainline

- moved complex XSD to framework

Author: Olga Kopylova

app/code/Magento/ProductVideo/etc/view.xml

@@ -5,7 +5,7 @@
 * See COPYING.txt for license details.
 */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_ProductVideo:etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ProductVideo/etc/view.xsd">
     <media>
         <videos module="Magento_ProductVideo">
             <video id="play_if_base" type="play_if_base">

app/code/Magento/Swatches/etc/view.xml

@@ -5,7 +5,7 @@
 * See COPYING.txt for license details.
 */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
     <media>
         <images module="Magento_Catalog">
             <image id="swatch_image" type="swatch_image">

app/design/adminhtml/Magento/backend/etc/view.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
     <vars module="Js_Bundle">
         <var name="bundle_size">1MB</var>
     </vars>

app/design/frontend/Magento/blank/etc/view.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
     <media>
         <images module="Magento_Catalog">
             <image id="bundled_product_customization_page" type="thumbnail">

app/design/frontend/Magento/luma/etc/view.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/view.xsd">
+<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Catalog/etc/view.xsd">
     <media>
         <images module="Magento_Catalog">
             <image id="bundled_product_customization_page" type="thumbnail">

dev/tests/static/framework/Magento/TestFramework/Utility/Validator.php

@@ -7,7 +7,6 @@
 namespace Magento\Test\Integrity\Xml;
 
 use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\Config\Dom\UrnResolver;
 
 class SchemaTest extends \PHPUnit_Framework_TestCase
 {
@@ -36,18 +35,11 @@ function ($filename) {
                     . 'xsi:noNamespaceSchemaLocation="urn:magento:framework:Relative_Path/something.xsd"'
                 );
 
-                try {
-                    $schemaFile = (new UrnResolver())->getRealPath($schemaLocations[1]);
-                    $this->assertFileExists($schemaFile, "$filename refers to an invalid schema $schemaFile.");
-                    $errors = \Magento\TestFramework\Utility\Validator::validateXml($dom, $schemaFile);
-                    $this->assertEmpty(
-                        $errors,
-                        "Error validating $filename against $schemaFile\n" . print_r($errors, true)
-                    );
-                } catch (\UnexpectedValueException $e) {
-                    $this->fail($e->getMessage());
-                }
-
+                $errors = \Magento\Framework\Config\Dom::validateDomDocument($dom, $schemaLocations[1]);
+                $this->assertEmpty(
+                    $errors,
+                    "Error validating $filename against {$schemaLocations[1]}\n" . print_r($errors, true)
+                );
             },
             $this->getXmlFiles()
         );

dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php

@@ -0,0 +1 @@
+Library contains schema files used to validate XML files in Magento\Catalog module

lib/internal/Magento/Framework/Catalog/README.md

@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
+    <xs:redefine schemaLocation="../../Config/etc/view.xsd">
         <xs:complexType name="mediaType" mixed="true">
             <xs:complexContent>
                 <xs:extension base="mediaType">

app/code/Magento/Catalog/etc/view.xsd renamed to lib/internal/Magento/Framework/Catalog/etc/view.xsd

@@ -0,0 +1 @@
+Library contains schema files used to validate XML files in Magento\ProductVideo module