beiwei30 closed pull request #2470: fix some xsd error URL: https://github.com/apache/incubator-dubbo/pull/2470
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd index 59245913fd..92d7bd2705 100644 --- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd +++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - xmlns:beans="http://www.springframework.org/schema/beans"; + xmlns:beans="http://www.springframework.org/schema/beans"; xmlns:tool="http://www.springframework.org/schema/tool"; xmlns="http://code.alibabatech.com/schema/dubbo"; targetNamespace="http://code.alibabatech.com/schema/dubbo";> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> - <xsd:import namespace="http://www.springframework.org/schema/beans"/> + <xsd:import namespace="http://www.springframework.org/schema/beans"; schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool"/> <xsd:annotation> diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd index ecec23acc0..88fe25fccb 100644 --- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd +++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd @@ -6,7 +6,7 @@ targetNamespace="http://dubbo.apache.org/schema/dubbo";> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> - <xsd:import namespace="http://www.springframework.org/schema/beans"/> + <xsd:import namespace="http://www.springframework.org/schema/beans"; schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> <xsd:import namespace="http://www.springframework.org/schema/tool"/> <xsd:annotation> diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/web-fragment.xml b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/web-fragment.xml index 220874ab78..c063bdf2f3 100644 --- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/web-fragment.xml +++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/web-fragment.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd";> - <name>dubbo-fragment</name> + <name>dubbo_fragment</name> <ordering> <before> diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-consumer.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-consumer.xml index 2a4a2c0357..1d8bdbaf0e 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-consumer.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-consumer.xml @@ -19,7 +19,7 @@ xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; xmlns="http://www.springframework.org/schema/beans"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd - http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo";> + http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="annotation-consumer"/> <dubbo:registry address="127.0.0.1:4548"/> diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-multi-protocol.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-multi-protocol.xml index 80fd28f9d7..94ddd3b98a 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-multi-protocol.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-multi-protocol.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -21,7 +22,7 @@ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd "> - <!-- current application configuration -->> + <!-- current application configuration --> <dubbo:application name="demo-provider"/> <!-- registry center configuration --> diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-multi.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-multi.xml index 673cab155b..7b70615d60 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-multi.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-multi.xml @@ -18,8 +18,7 @@ xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; xmlns="http://www.springframework.org/schema/beans"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd - http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd - "> + http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="service-class"/> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
