恢复: spring.schemas中的schema不强制转为unqualified

common/springext/src/main/java/com/alibaba/citrus/springext/impl/SchemaImpl.java

@@ -117,12 +117,7 @@ private SpringPluggableSchemaImpl(String name, String version, String targetName
             }
         }
 
-        Schema schema = new SpringPluggableSchemaImpl(name, version, null, null, parsingTargetNamespace, sourceDesc, source, null, true, sourceInfo);
-
-        // 强制转换成unqualified style
-        schema.transform(getUnqualifiedStyleTransformer());
-
-        return schema;
+        return new SpringPluggableSchemaImpl(name, version, null, null, parsingTargetNamespace, sourceDesc, source, null, true, sourceInfo);
     }
 
     /** 创建一般的schema。 */

common/springext/src/test/java/com/alibaba/citrus/springext/impl/SpringPluggableSchemaTests.java

@@ -88,7 +88,7 @@ public void unqualifiedStyle() throws Exception {
         String elementQualified = "elementFormDefault=\"qualified\"";
 
         assertThat(textOriginal, containsString(elementQualified)); // springext-base-types.xsd包含elementFormDefault
-        assertThat(textTransformed, not(containsString(elementQualified))); // 转换后被强制去除。
+        assertThat(textTransformed, containsString(elementQualified)); // 转换后被保留。
     }
 
     @Test

test/webx/src/main/resources/com/alibaba/citrus/test/context/context-template.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:services="http://www.alibaba.com/schema/services" xsi:schemaLocation="
-                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="
                  http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
              ">
 

test/webx/src/main/resources/com/alibaba/citrus/test/context/test-resources.xml

@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:services="http://www.alibaba.com/schema/services" xmlns:res-filters="http://www.alibaba.com/schema/services/resource-loading/filters" xmlns:res-loaders="http://www.alibaba.com/schema/services/resource-loading/loaders" xsi:schemaLocation="
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:services="http://www.alibaba.com/schema/services"
+             xmlns:res-loaders="http://www.alibaba.com/schema/services/resource-loading/loaders"
+             xsi:schemaLocation="
                  http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
-                 http://www.alibaba.com/schema/services/resource-loading/filters http://localhost:8080/schema/services-resource-loading-filters.xsd
                  http://www.alibaba.com/schema/services/resource-loading/loaders http://localhost:8080/schema/services-resource-loading-loaders.xsd
                  http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
              ">
 
-    <services:property-placeholder/>
+    <services:property-placeholder />
 
     <services:resource-loading>
 
-        <resource-alias pattern="/" name="/srcdir"/>
+        <resource-alias pattern="/" name="/srcdir" />
 
         <resource pattern="/srcdir">
-            <res-loaders:file-loader basedir="${test.srcdir}"/>
+            <res-loaders:file-loader basedir="${test.srcdir}" />
         </resource>
 
         <resource pattern="/destdir">
-            <res-loaders:file-loader basedir="${test.destdir}"/>
+            <res-loaders:file-loader basedir="${test.destdir}" />
         </resource>
 
         <resource pattern="/classpath">
-            <res-loaders:classpath-loader/>
+            <res-loaders:classpath-loader />
         </resource>
 
     </services:resource-loading>

webx/framework/src/test/resources/META-INF/mycomponent/a.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:services="http://www.alibaba.com/schema/services" xsi:schemaLocation="
-                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="
                  http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
              ">
 
     <beans:bean id="s1" class="java.lang.String">
-        <beans:constructor-arg value="hello"/>
+        <beans:constructor-arg value="hello" />
     </beans:bean>
 
 </beans:beans>

webx/framework/src/test/resources/META-INF/mycomponent/b.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:services="http://www.alibaba.com/schema/services" xsi:schemaLocation="
-                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="
                  http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
              ">
 
     <beans:bean id="s2" class="java.lang.String">
-        <beans:constructor-arg value="world"/>
+        <beans:constructor-arg value="world" />
     </beans:bean>
 
 </beans:beans>