This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new cfd474d fix some xsd error (#2470)
cfd474d is described below
commit cfd474d12f0ab4fa266ebd4d1b8c2bd2085eea07
Author: elmar.chen <chx...@gmail.com>
AuthorDate: Tue Sep 18 10:07:32 2018 +0800
fix some xsd error (#2470)
* fix some xsd error
* remove version info from imported spring-beans.xsd (though I do believe
including a version is a better practice).
---
.../dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd | 4 ++--
.../dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd | 2 +-
.../resources/org/apache/dubbo/config/spring/annotation-consumer.xml | 2 +-
.../org/apache/dubbo/config/spring/override-multi-protocol.xml | 1 +
.../test/resources/org/apache/dubbo/config/spring/provider-multi.xml | 3 +--
5 files changed, 6 insertions(+), 6 deletions(-)
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 5924591..92d7bd2 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 ecec23a..88fe25f 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/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 2a4a2c0..1d8bdba 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 faa8c8c..524e8fc 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
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 673cab1..7b70615 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"/>
