diff --git a/common/expr/pom.xml b/common/expr/pom.xml
index dcfc4a9bf..aea0e134d 100644
--- a/common/expr/pom.xml
+++ b/common/expr/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/common/generictype/pom.xml b/common/generictype/pom.xml
index 5606684d7..e0ef39db3 100644
--- a/common/generictype/pom.xml
+++ b/common/generictype/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/common/generictype/src/main/java.working/com/alibaba/citrus/generictype/introspect/package.html b/common/generictype/src/main/java.working/com/alibaba/citrus/generictype/introspect/package.html
index 5d86c81a1..6e9b0953e 100644
--- a/common/generictype/src/main/java.working/com/alibaba/citrus/generictype/introspect/package.html
+++ b/common/generictype/src/main/java.working/com/alibaba/citrus/generictype/introspect/package.html
@@ -1,7 +1,7 @@
-
+
Package com.alibaba.citrus.generictype.introspect
中,包含了分析类型内部结构的工具,例如,取得类型的properties。
diff --git a/common/generictype/src/main/java/com/alibaba/citrus/generictype/package.html b/common/generictype/src/main/java/com/alibaba/citrus/generictype/package.html
index eef21ca9f..2b1fa940b 100644
--- a/common/generictype/src/main/java/com/alibaba/citrus/generictype/package.html
+++ b/common/generictype/src/main/java/com/alibaba/citrus/generictype/package.html
@@ -1,7 +1,7 @@
-
+
Package com.alibaba.citrus.generictype
中,包含了分析generic类型的工具。
diff --git a/common/hessian/pom.xml b/common/hessian/pom.xml
index cfb08e29f..90d96c31c 100644
--- a/common/hessian/pom.xml
+++ b/common/hessian/pom.xml
@@ -1,23 +1,23 @@
-
- citrus-parent
- com.alibaba.citrus
- 3.0.8
- ../../pom.xml
-
- 4.0.0
- citrus-common-hessian
- Hessian Port
-
-
-
- maven-surefire-plugin
-
- true
-
-
-
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ citrus-parent
+ com.alibaba.citrus
+ 3.0.8
+ ../../pom.xml
+
+ 4.0.0
+ citrus-common-hessian
+ Hessian Port
+
+
+
+ maven-surefire-plugin
+
+ true
+
+
+
+
diff --git a/common/logconfig/pom.xml b/common/logconfig/pom.xml
index afd734075..c8477ed71 100644
--- a/common/logconfig/pom.xml
+++ b/common/logconfig/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/common/logconfig/src/test/config/WEB-INF/web.xml b/common/logconfig/src/test/config/WEB-INF/web.xml
index 871966732..204d92cf0 100644
--- a/common/logconfig/src/test/config/WEB-INF/web.xml
+++ b/common/logconfig/src/test/config/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/common/logconfig/src/test/config/WEB-INF/web2.xml b/common/logconfig/src/test/config/WEB-INF/web2.xml
index 6dd34613b..b1053c514 100644
--- a/common/logconfig/src/test/config/WEB-INF/web2.xml
+++ b/common/logconfig/src/test/config/WEB-INF/web2.xml
@@ -1,7 +1,7 @@
diff --git a/common/springext/pom.xml b/common/springext/pom.xml
index 60c154912..4de199096 100644
--- a/common/springext/pom.xml
+++ b/common/springext/pom.xml
@@ -1,6 +1,6 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/common/springext/src/main/resources/META-INF/springext/springext-base.xsd b/common/springext/src/main/resources/META-INF/springext/springext-base.xsd
index f3d27422b..114116b42 100644
--- a/common/springext/src/main/resources/META-INF/springext/springext-base.xsd
+++ b/common/springext/src/main/resources/META-INF/springext/springext-base.xsd
@@ -1,11 +1,11 @@
+ targetNamespace="http://www.alibaba.com/schema/springext/base"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/common/springext/src/main/resources/META-INF/web-springext-helper.xml b/common/springext/src/main/resources/META-INF/web-springext-helper.xml
index 63794a5bb..ddc02bbb7 100644
--- a/common/springext/src/main/resources/META-INF/web-springext-helper.xml
+++ b/common/springext/src/main/resources/META-INF/web-springext-helper.xml
@@ -1,7 +1,7 @@
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
com.alibaba.citrus.logconfig.LogConfiguratorListener
diff --git a/common/springext/src/main/resources/com/alibaba/citrus/springext/export/schema-exporter.js b/common/springext/src/main/resources/com/alibaba/citrus/springext/export/schema-exporter.js
index f33b8cb90..0479eee21 100644
--- a/common/springext/src/main/resources/com/alibaba/citrus/springext/export/schema-exporter.js
+++ b/common/springext/src/main/resources/com/alibaba/citrus/springext/export/schema-exporter.js
@@ -1,7 +1,7 @@
function registerToggleTargetNamespace() {
var checkbox = $('toggleTargetNamespace');
- var checkboxOnClick = function(event) {
- $$("li.no-target-namespace").each( function(e) {
+ var checkboxOnClick = function (event) {
+ $$("li.no-target-namespace").each(function (e) {
if (checkbox.checked) {
e.show();
} else {
@@ -16,7 +16,7 @@ function registerToggleTargetNamespace() {
function registerToggleXmlTemplate() {
var checkbox = $('toggleXmlTemplate');
- var checkboxOnClick = function(event) {
+ var checkboxOnClick = function (event) {
if (checkbox.checked) {
$('xml-template').show();
} else {
@@ -31,10 +31,10 @@ function registerToggleXmlTemplate() {
function registerUpdateXmlTemplate() {
var checkboxes = $$('li input[type="checkbox"]');
- var updateXmlTemplate = function(event) {
+ var updateXmlTemplate = function (event) {
var checkbox = event == null ? null : event.target;
var currentNs = checkbox != null && checkbox.checked ? checkbox.name
- .split(';')[0] : null;
+ .split(';')[0] : null;
var beans = false;
var beansNames = null;
var xml = '';
@@ -42,43 +42,43 @@ function registerUpdateXmlTemplate() {
xml += '\n'.escapeHTML();
xml += '' + decl + '';
- locations += '' + loc + '';
- } else {
- xml += decl;
- locations += loc;
- }
- }
- });
+ .each(function (e) {
+ var names = e.name.split(';');
+
+ if (beansNames == null
+ && names[0] == 'http://www.springframework.org/schema/beans') {
+ beans = e.checked;
+ beansNames = names;
+ }
+
+ if (e.checked) {
+ var decl = (' xmlns:' + names[1] + '="'
+ + names[0] + '"\n').escapeHTML();
+ var loc = (' ' + names[0] + ' '
+ + names[2] + '\n').escapeHTML();
+
+ if (currentNs == names[0]) {
+ xml += '' + decl + '';
+ locations += '' + loc + '';
+ } else {
+ xml += decl;
+ locations += loc;
+ }
+ }
+ });
if (!beans && beansNames != null) {
xml += (' xmlns:' + beansNames[1] + '="'
- + beansNames[0] + '"\n').escapeHTML();
+ + beansNames[0] + '"\n').escapeHTML();
locations += (' ' + beansNames[0] + ' '
- + beansNames[2] + '\n').escapeHTML();
+ + beansNames[2] + '\n').escapeHTML();
}
xml += ' xmlns:p="http://www.springframework.org/schema/p"\n'
- .escapeHTML();
+ .escapeHTML();
xml += ' xsi:schemaLocation="\n'.escapeHTML();
xml += locations;
@@ -90,7 +90,7 @@ function registerUpdateXmlTemplate() {
$('xml-template').innerHTML = xml;
};
- checkboxes.each( function(e) {
+ checkboxes.each(function (e) {
e.observe('click', updateXmlTemplate);
})
@@ -98,7 +98,7 @@ function registerUpdateXmlTemplate() {
}
function registerDirectoryHandle() {
- var handleClick = function(event) {
+ var handleClick = function (event) {
var imgObj = event.target;
var imgSrc = imgObj.src;
var subdirs = imgObj.id.gsub(/^handle-/, 'subdirs-');
@@ -115,12 +115,12 @@ function registerDirectoryHandle() {
}
};
- $$('li.directory>img').each( function(e) {
+ $$('li.directory>img').each(function (e) {
e.observe('click', handleClick);
});
}
-document.observe("dom:loaded", function() {
+document.observe("dom:loaded", function () {
registerToggleXmlTemplate();
registerToggleTargetNamespace();
registerUpdateXmlTemplate();
diff --git a/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles-ie.css b/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles-ie.css
index 1411560e3..150d9a1f3 100644
--- a/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles-ie.css
+++ b/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles-ie.css
@@ -1,7 +1,7 @@
li.no-target-namespace {
- filter: alpha(opacity=50);
+ filter: alpha(opacity = 50);
}
li.no-target-namespace li.no-target-namespace {
- filter: alpha(opacity=100);
+ filter: alpha(opacity = 100);
}
diff --git a/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles.css b/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles.css
index 752fb3f90..58cee15e4 100644
--- a/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles.css
+++ b/common/springext/src/main/resources/com/alibaba/citrus/springext/export/styles.css
@@ -27,11 +27,11 @@ a {
text-decoration: none;
}
-a:link,a:visited {
+a:link, a:visited {
}
-a:hover,a:active {
+a:hover, a:active {
font-weight: bold
}
@@ -40,12 +40,12 @@ a:hover,a:active {
background-color: inherit;
}
-li.file,li.directory {
+li.file, li.directory {
list-style: none;
white-space: nowrap;
}
-li.file img,li.directory img {
+li.file img, li.directory img {
margin: 2px;
}
@@ -60,7 +60,7 @@ div.control-bar span {
padding: 10px;
}
-.code,.xml-template {
+.code, .xml-template {
font-family: Consolas, "Courier New", Courier, monospace;
font-size: small;
}
diff --git a/common/springext/src/test/config/WEB-INF/web.xml b/common/springext/src/test/config/WEB-INF/web.xml
index 88a1469bb..a76ae719f 100644
--- a/common/springext/src/test/config/WEB-INF/web.xml
+++ b/common/springext/src/test/config/WEB-INF/web.xml
@@ -1,14 +1,15 @@
servlet
- com.alibaba.citrus.springext.support.context.XmlWebApplicationContextTests$NoopServlet
+ com.alibaba.citrus.springext.support.context.XmlWebApplicationContextTests$NoopServlet
+
diff --git a/common/springext/src/test/config/beans-autowire-parent.xml b/common/springext/src/test/config/beans-autowire-parent.xml
index 6b529c218..5c4d39077 100644
--- a/common/springext/src/test/config/beans-autowire-parent.xml
+++ b/common/springext/src/test/config/beans-autowire-parent.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.springext.support.context.InheritableBeanFactoryTests$RequestPostProcessor" />
diff --git a/common/springext/src/test/config/beans-autowire.xml b/common/springext/src/test/config/beans-autowire.xml
index 550962492..0e389ba9b 100644
--- a/common/springext/src/test/config/beans-autowire.xml
+++ b/common/springext/src/test/config/beans-autowire.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.springext.support.context.InheritableBeanFactoryTests$MyObject" />
diff --git a/common/springext/src/test/config/beans-default-values.xml b/common/springext/src/test/config/beans-default-values.xml
index 388f389bb..f78db156a 100644
--- a/common/springext/src/test/config/beans-default-values.xml
+++ b/common/springext/src/test/config/beans-default-values.xml
@@ -1,18 +1,18 @@
+ default-autowire="byName" default-autowire-candidates="*String1"
+ default-dependency-check="simple" default-lazy-init="true">
+ dependency-check="none" lazy-init="false">
diff --git a/common/springext/src/test/config/beans.xml b/common/springext/src/test/config/beans.xml
index 0e58118cd..8d1c26997 100644
--- a/common/springext/src/test/config/beans.xml
+++ b/common/springext/src/test/config/beans.xml
@@ -1,12 +1,12 @@
diff --git a/common/springext/src/test/config/my-beans-no-default-name.xml b/common/springext/src/test/config/my-beans-no-default-name.xml
index 7cebaa61c..5a0cc521e 100644
--- a/common/springext/src/test/config/my-beans-no-default-name.xml
+++ b/common/springext/src/test/config/my-beans-no-default-name.xml
@@ -1,8 +1,8 @@
diff --git a/common/springext/src/test/config/my-beans.xml b/common/springext/src/test/config/my-beans.xml
index 8ed693c67..ae505ea03 100644
--- a/common/springext/src/test/config/my-beans.xml
+++ b/common/springext/src/test/config/my-beans.xml
@@ -1,8 +1,8 @@
diff --git a/common/springext/src/test/config/schema/all.xsd b/common/springext/src/test/config/schema/all.xsd
index 44232b326..753719b20 100644
--- a/common/springext/src/test/config/schema/all.xsd
+++ b/common/springext/src/test/config/schema/all.xsd
@@ -1,6 +1,6 @@
+ targetNamespace="http://www.alibaba.com/schema/test" elementFormDefault="qualified">
diff --git a/common/springext/src/test/config/services.xml b/common/springext/src/test/config/services.xml
index d57c5b0f4..e279c6834 100644
--- a/common/springext/src/test/config/services.xml
+++ b/common/springext/src/test/config/services.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.springext.support.BeanSupportTests$MyServiceImpl" />
diff --git a/common/springext/src/test/config/test-import-each-other.xml b/common/springext/src/test/config/test-import-each-other.xml
index 9b63c6449..2332161a6 100644
--- a/common/springext/src/test/config/test-import-each-other.xml
+++ b/common/springext/src/test/config/test-import-each-other.xml
@@ -1,10 +1,10 @@
+ schemaLocation="http://localhost:8080/schema/my-cp2.xsd" />
+ maxOccurs="unbounded" />
+ maxOccurs="unbounded" />
diff --git a/common/springext/src/test/resources/META-INF/my/cp1/test2.xsd b/common/springext/src/test/resources/META-INF/my/cp1/test2.xsd
index 3a27a586b..19be718ff 100644
--- a/common/springext/src/test/resources/META-INF/my/cp1/test2.xsd
+++ b/common/springext/src/test/resources/META-INF/my/cp1/test2.xsd
@@ -4,9 +4,9 @@
+ maxOccurs="unbounded" />
+ maxOccurs="unbounded" />
diff --git a/common/springext/src/test/resources/META-INF/services/container.xsd b/common/springext/src/test/resources/META-INF/services/container.xsd
index 1d39be230..7c723254f 100644
--- a/common/springext/src/test/resources/META-INF/services/container.xsd
+++ b/common/springext/src/test/resources/META-INF/services/container.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/common/springext/src/test/resources/META-INF/services/my-bean-no-default-name.xsd b/common/springext/src/test/resources/META-INF/services/my-bean-no-default-name.xsd
index fcc09c839..de12cb2e1 100644
--- a/common/springext/src/test/resources/META-INF/services/my-bean-no-default-name.xsd
+++ b/common/springext/src/test/resources/META-INF/services/my-bean-no-default-name.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/common/springext/src/test/resources/META-INF/services/my-bean.xsd b/common/springext/src/test/resources/META-INF/services/my-bean.xsd
index 0ea506c38..767f87009 100644
--- a/common/springext/src/test/resources/META-INF/services/my-bean.xsd
+++ b/common/springext/src/test/resources/META-INF/services/my-bean.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/common/springext/src/test/resources/META-INF/services/tools/dateformat.xsd b/common/springext/src/test/resources/META-INF/services/tools/dateformat.xsd
index 3a1881dc3..304a7fa3c 100644
--- a/common/springext/src/test/resources/META-INF/services/tools/dateformat.xsd
+++ b/common/springext/src/test/resources/META-INF/services/tools/dateformat.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/common/springext/src/test/resources/META-INF/springext-base-types.xsd b/common/springext/src/test/resources/META-INF/springext-base-types.xsd
index 02f92baee..af9e7d0ce 100644
--- a/common/springext/src/test/resources/META-INF/springext-base-types.xsd
+++ b/common/springext/src/test/resources/META-INF/springext-base-types.xsd
@@ -1,10 +1,10 @@
+ targetNamespace="http://www.alibaba.com/schema/springext/base-types"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/common/util/pom.xml b/common/util/pom.xml
index 4c3a90b60..71e42c799 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -1,6 +1,6 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/dist/test/pom.xml b/dist/test/pom.xml
index 0ba9986aa..342f1821b 100644
--- a/dist/test/pom.xml
+++ b/dist/test/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
@@ -43,7 +43,8 @@
${project.groupId}:citrus-test-*
- com.alibaba.citrus.hessian:com.alibaba.citrus.burlap:freemarker
+ com.alibaba.citrus.hessian:com.alibaba.citrus.burlap:freemarker
+
@@ -67,7 +68,7 @@
+ implementation="com.alibaba.citrus.maven.util.AppendingTransformer">
META-INF/*.bean-definition-parsers
META-INF/*.bean-definition-decorators
diff --git a/dist/webx/pom.xml b/dist/webx/pom.xml
index 4a1869335..efdf87735 100644
--- a/dist/webx/pom.xml
+++ b/dist/webx/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
@@ -43,7 +43,8 @@
${project.groupId}:*
- com.alibaba.citrus.hessian:com.alibaba.citrus.burlap:freemarker
+ com.alibaba.citrus.hessian:com.alibaba.citrus.burlap:freemarker
+
@@ -66,7 +67,7 @@
+ implementation="com.alibaba.citrus.maven.util.AppendingTransformer">
META-INF/*.bean-definition-parsers
META-INF/*.bean-definition-decorators
diff --git a/pom.xml b/pom.xml
index 8ade22624..6272cc0e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
org.sonatype.oss
oss-parent
@@ -723,7 +723,7 @@
maven-gpg-plugin
1.4
-
org.eclipse.m2e
diff --git a/service/base/pom.xml b/service/base/pom.xml
index c942136bc..37ebf0da4 100644
--- a/service/base/pom.xml
+++ b/service/base/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/configuration/pom.xml b/service/configuration/pom.xml
index 5f5c8f8c4..f42b07739 100644
--- a/service/configuration/pom.xml
+++ b/service/configuration/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/configuration/src/main/resources/META-INF/services/property-editor-registrars.xsd b/service/configuration/src/main/resources/META-INF/services/property-editor-registrars.xsd
index e84a9ef75..753844020 100644
--- a/service/configuration/src/main/resources/META-INF/services/property-editor-registrars.xsd
+++ b/service/configuration/src/main/resources/META-INF/services/property-editor-registrars.xsd
@@ -1,20 +1,20 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
+ minOccurs="0" maxOccurs="unbounded">
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -26,7 +26,7 @@
+ default="true" />
diff --git a/service/configuration/src/main/resources/META-INF/services/simple-configuration.xsd b/service/configuration/src/main/resources/META-INF/services/simple-configuration.xsd
index 9275f81d5..b3eb087b5 100644
--- a/service/configuration/src/main/resources/META-INF/services/simple-configuration.xsd
+++ b/service/configuration/src/main/resources/META-INF/services/simple-configuration.xsd
@@ -1,20 +1,20 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
+ default="true" />
diff --git a/service/configuration/src/test/config/my-configuration-global.xml b/service/configuration/src/test/config/my-configuration-global.xml
index 998e8739d..c08781684 100644
--- a/service/configuration/src/test/config/my-configuration-global.xml
+++ b/service/configuration/src/test/config/my-configuration-global.xml
@@ -1,10 +1,10 @@
true
globalStringValue
-
+
myBean2Global
diff --git a/service/configuration/src/test/config/my-configuration-wrong.xml b/service/configuration/src/test/config/my-configuration-wrong.xml
index 7b2545a93..83d7f9aef 100644
--- a/service/configuration/src/test/config/my-configuration-wrong.xml
+++ b/service/configuration/src/test/config/my-configuration-wrong.xml
@@ -1,15 +1,15 @@
+ xmlns="http://www.alibaba.com/schema/services">
false
diff --git a/service/configuration/src/test/config/my-configuration.xml b/service/configuration/src/test/config/my-configuration.xml
index dc8a0f6ba..55dd58e52 100644
--- a/service/configuration/src/test/config/my-configuration.xml
+++ b/service/configuration/src/test/config/my-configuration.xml
@@ -1,15 +1,15 @@
+ xmlns="http://www.alibaba.com/schema/services">
true
stringValue
myBean1
diff --git a/service/configuration/src/test/config/property-placeholder-1.xml b/service/configuration/src/test/config/property-placeholder-1.xml
index 7b6e9ba23..723c4bfc3 100644
--- a/service/configuration/src/test/config/property-placeholder-1.xml
+++ b/service/configuration/src/test/config/property-placeholder-1.xml
@@ -1,16 +1,16 @@
- ccc
+ ccc
diff --git a/service/configuration/src/test/config/property-placeholder-2.xml b/service/configuration/src/test/config/property-placeholder-2.xml
index 09f05d0ce..7801c7f1e 100644
--- a/service/configuration/src/test/config/property-placeholder-2.xml
+++ b/service/configuration/src/test/config/property-placeholder-2.xml
@@ -1,11 +1,11 @@
diff --git a/service/configuration/src/test/config/property-placeholder-3.xml b/service/configuration/src/test/config/property-placeholder-3.xml
index 258b6053c..a5b8d41d6 100644
--- a/service/configuration/src/test/config/property-placeholder-3.xml
+++ b/service/configuration/src/test/config/property-placeholder-3.xml
@@ -1,11 +1,11 @@
diff --git a/service/configuration/src/test/config/property-placeholder-4.xml b/service/configuration/src/test/config/property-placeholder-4.xml
index 32af50f67..cb0cdfc28 100644
--- a/service/configuration/src/test/config/property-placeholder-4.xml
+++ b/service/configuration/src/test/config/property-placeholder-4.xml
@@ -1,11 +1,11 @@
diff --git a/service/configuration/src/test/config/property-placeholder-5.xml b/service/configuration/src/test/config/property-placeholder-5.xml
index 738a62551..5ac1d7f89 100644
--- a/service/configuration/src/test/config/property-placeholder-5.xml
+++ b/service/configuration/src/test/config/property-placeholder-5.xml
@@ -1,11 +1,11 @@
diff --git a/service/configuration/src/test/config/property-placeholder-6.xml b/service/configuration/src/test/config/property-placeholder-6.xml
index f42f5a425..8d3a731ec 100644
--- a/service/configuration/src/test/config/property-placeholder-6.xml
+++ b/service/configuration/src/test/config/property-placeholder-6.xml
@@ -1,11 +1,11 @@
diff --git a/service/configuration/src/test/config/property-placeholder-7.xml b/service/configuration/src/test/config/property-placeholder-7.xml
index 2c95d73d5..ad1b287ec 100644
--- a/service/configuration/src/test/config/property-placeholder-7.xml
+++ b/service/configuration/src/test/config/property-placeholder-7.xml
@@ -1,11 +1,11 @@
diff --git a/service/configuration/src/test/config/property-placeholder.xml b/service/configuration/src/test/config/property-placeholder.xml
index 480f89d13..4a5f67e31 100644
--- a/service/configuration/src/test/config/property-placeholder.xml
+++ b/service/configuration/src/test/config/property-placeholder.xml
@@ -1,8 +1,8 @@
diff --git a/service/configuration/src/test/config/registrars.xml b/service/configuration/src/test/config/registrars.xml
index a9cd23913..18619801d 100644
--- a/service/configuration/src/test/config/registrars.xml
+++ b/service/configuration/src/test/config/registrars.xml
@@ -1,24 +1,24 @@
+ class="com.alibaba.citrus.service.configuration.PropertyEditorRegistrarsTests$MyRegistrar"
+ p:type="long" />
+ class="com.alibaba.citrus.service.configuration.PropertyEditorRegistrarsTests$MyRegistrar"
+ p:type="java.lang.Long" />
diff --git a/service/configuration/src/test/config/simple-configuration-skip-validation.xml b/service/configuration/src/test/config/simple-configuration-skip-validation.xml
index cd45f0f7e..5ed2ec568 100644
--- a/service/configuration/src/test/config/simple-configuration-skip-validation.xml
+++ b/service/configuration/src/test/config/simple-configuration-skip-validation.xml
@@ -1,9 +1,9 @@
diff --git a/service/configuration/src/test/config/simple-configuration.xml b/service/configuration/src/test/config/simple-configuration.xml
index ebb65ea3f..8d7d5587c 100644
--- a/service/configuration/src/test/config/simple-configuration.xml
+++ b/service/configuration/src/test/config/simple-configuration.xml
@@ -1,9 +1,9 @@
diff --git a/service/configuration/src/test/resources/META-INF/services/my-configuration.xsd b/service/configuration/src/test/resources/META-INF/services/my-configuration.xsd
index 6e409f165..1a01fe8cb 100644
--- a/service/configuration/src/test/resources/META-INF/services/my-configuration.xsd
+++ b/service/configuration/src/test/resources/META-INF/services/my-configuration.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/dataresolver/pom.xml b/service/dataresolver/pom.xml
index 12e4f8b47..3232cd21d 100644
--- a/service/dataresolver/pom.xml
+++ b/service/dataresolver/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/dataresolver/src/main/resources/META-INF/services/data-resolver.xsd b/service/dataresolver/src/main/resources/META-INF/services/data-resolver.xsd
index 3bbb50219..64cf129f1 100644
--- a/service/dataresolver/src/main/resources/META-INF/services/data-resolver.xsd
+++ b/service/dataresolver/src/main/resources/META-INF/services/data-resolver.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -21,7 +21,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/dataresolver/src/test/config/services.xml b/service/dataresolver/src/test/config/services.xml
index 3e4015cca..716268961 100644
--- a/service/dataresolver/src/test/config/services.xml
+++ b/service/dataresolver/src/test/config/services.xml
@@ -1,11 +1,11 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/form/src/main/resources/META-INF/services/form.xsd b/service/form/src/main/resources/META-INF/services/form.xsd
index d2fff4a04..97076a847 100644
--- a/service/form/src/main/resources/META-INF/services/form.xsd
+++ b/service/form/src/main/resources/META-INF/services/form.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -21,7 +21,7 @@
+ minOccurs="0" maxOccurs="unbounded">
-
+
@@ -57,7 +57,7 @@
+ maxOccurs="unbounded">
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/conditions/jexl-condition.xsd b/service/form/src/main/resources/META-INF/services/form/conditions/jexl-condition.xsd
index 24943aa43..d3cb7afcb 100644
--- a/service/form/src/main/resources/META-INF/services/form/conditions/jexl-condition.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/conditions/jexl-condition.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/all-of-values.xsd b/service/form/src/main/resources/META-INF/services/form/validators/all-of-values.xsd
index 20a4b697e..4186051c3 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/all-of-values.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/all-of-values.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -21,7 +21,7 @@
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/all-of.xsd b/service/form/src/main/resources/META-INF/services/form/validators/all-of.xsd
index 442336286..b1bf51ac9 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/all-of.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/all-of.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -19,7 +19,7 @@
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/any-of-values.xsd b/service/form/src/main/resources/META-INF/services/form/validators/any-of-values.xsd
index 8967db2b2..fdaafa41f 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/any-of-values.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/any-of-values.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -21,7 +21,7 @@
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/any-of.xsd b/service/form/src/main/resources/META-INF/services/form/validators/any-of.xsd
index 77d75d2e1..e9fa9545b 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/any-of.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/any-of.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/choose.xsd b/service/form/src/main/resources/META-INF/services/form/validators/choose.xsd
index a4238cf12..e94855ab2 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/choose.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/choose.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -18,7 +18,7 @@
+ maxOccurs="unbounded" />
@@ -27,9 +27,9 @@
+ minOccurs="0" />
+ minOccurs="1" maxOccurs="unbounded" />
@@ -37,7 +37,7 @@
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/custom-error.xsd b/service/form/src/main/resources/META-INF/services/form/validators/custom-error.xsd
index 61fa2c44e..7ee3f63c6 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/custom-error.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/custom-error.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/date-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/date-validator.xsd
index 18cbb9a0c..9248614c6 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/date-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/date-validator.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/if.xsd b/service/form/src/main/resources/META-INF/services/form/validators/if.xsd
index 06f0d58ca..9b51de97b 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/if.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/if.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -18,9 +18,9 @@
+ minOccurs="0" />
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/mail-address-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/mail-address-validator.xsd
index c6bd64128..a2d8ff51e 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/mail-address-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/mail-address-validator.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/multi-values-count-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/multi-values-count-validator.xsd
index 7de086259..da4a27f72 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/multi-values-count-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/multi-values-count-validator.xsd
@@ -1,15 +1,15 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/none-of-values.xsd b/service/form/src/main/resources/META-INF/services/form/validators/none-of-values.xsd
index 4d23d5732..80791905d 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/none-of-values.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/none-of-values.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -19,7 +19,7 @@
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/none-of.xsd b/service/form/src/main/resources/META-INF/services/form/validators/none-of.xsd
index b52b399ed..944c304a9 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/none-of.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/none-of.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -19,7 +19,7 @@
+ minOccurs="1" maxOccurs="unbounded" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/number-compare-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/number-compare-validator.xsd
index b9e5f4ff2..8401e3414 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/number-compare-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/number-compare-validator.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/number-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/number-validator.xsd
index 11551d68e..c8a548cdb 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/number-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/number-validator.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/regexp-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/regexp-validator.xsd
index ba47b1273..3fb69120c 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/regexp-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/regexp-validator.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/required-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/required-validator.xsd
index 53d13c1fc..71af774d9 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/required-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/required-validator.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/string-byte-length-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/string-byte-length-validator.xsd
index 060231d14..35d92c3c3 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/string-byte-length-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/string-byte-length-validator.xsd
@@ -1,15 +1,15 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/string-compare-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/string-compare-validator.xsd
index 9aa312aca..6c5f54d8c 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/string-compare-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/string-compare-validator.xsd
@@ -1,15 +1,15 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/string-length-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/string-length-validator.xsd
index 15762b55f..e0b516c65 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/string-length-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/string-length-validator.xsd
@@ -1,15 +1,15 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/form/validators/uploaded-file-validator.xsd b/service/form/src/main/resources/META-INF/services/form/validators/uploaded-file-validator.xsd
index 77642c427..dedfc4597 100644
--- a/service/form/src/main/resources/META-INF/services/form/validators/uploaded-file-validator.xsd
+++ b/service/form/src/main/resources/META-INF/services/form/validators/uploaded-file-validator.xsd
@@ -1,11 +1,11 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:base="http://www.alibaba.com/schema/services/form/validators/base"
+ elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/form/src/main/resources/META-INF/services/pull/factories/form-tool.xsd b/service/form/src/main/resources/META-INF/services/pull/factories/form-tool.xsd
index dba04635e..3e0ae6e55 100644
--- a/service/form/src/main/resources/META-INF/services/pull/factories/form-tool.xsd
+++ b/service/form/src/main/resources/META-INF/services/pull/factories/form-tool.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/form/src/test/config/services-base-with-upload.xml b/service/form/src/test/config/services-base-with-upload.xml
index 71926cc72..6d4ba1da1 100644
--- a/service/form/src/test/config/services-base-with-upload.xml
+++ b/service/form/src/test/config/services-base-with-upload.xml
@@ -1,10 +1,10 @@
diff --git a/service/form/src/test/config/services-base-without-upload.xml b/service/form/src/test/config/services-base-without-upload.xml
index ac153425a..89284bac4 100644
--- a/service/form/src/test/config/services-base-without-upload.xml
+++ b/service/form/src/test/config/services-base-without-upload.xml
@@ -1,9 +1,9 @@
diff --git a/service/form/src/test/config/services-form-config.xml b/service/form/src/test/config/services-form-config.xml
index e6adbfe76..cb501f2e6 100644
--- a/service/form/src/test/config/services-form-config.xml
+++ b/service/form/src/test/config/services-form-config.xml
@@ -1,11 +1,11 @@
@@ -14,9 +14,9 @@
@@ -52,15 +52,15 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator"
+ p:success="true" p:message="message" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator"
+ p:success="false" p:message="message" />
@@ -74,7 +74,7 @@
diff --git a/service/form/src/test/config/services-form-no-request.xml b/service/form/src/test/config/services-form-no-request.xml
index 3d8059087..a0247162f 100644
--- a/service/form/src/test/config/services-form-no-request.xml
+++ b/service/form/src/test/config/services-form-no-request.xml
@@ -1,9 +1,9 @@
diff --git a/service/form/src/test/config/services-form-validators.xml b/service/form/src/test/config/services-form-validators.xml
index 6b9d4a2c0..c7b42b034 100644
--- a/service/form/src/test/config/services-form-validators.xml
+++ b/service/form/src/test/config/services-form-validators.xml
@@ -1,12 +1,12 @@
+ message="${displayName} length must be at least ${minLength}" />
+ message="${displayName} length must be less than ${maxLength}" />
+ message="${displayName} length must be at least ${minLength} and be less than ${maxLength}"
+ />
+ message="${displayName} length must be at least ${minLength}" />
+ message="${displayName} length must be less than ${maxLength}" />
+ message="${displayName} length must be at least ${minLength} and be less than ${maxLength}"
+ />
+ message="${displayName} must equal to ${equalTo}" />
+ message="${displayName} must not equal to ${notEqualTo}" />
+ message="${displayName} must be less than ${lessThan}" />
+ message="${displayName} must be greater than ${greaterThan}" />
+ message="${displayName} must be less than or equal to ${lessThanOrEqualTo}" />
+ message="${displayName} must be greater than or equal to ${greaterThanOrEqualTo}"
+ />
+ />
+ message="${displayName} must between ${greaterThan} and ${lessThanOrEqualTo}" />
+ message="${displayName} must equal to ${fieldName}" />
+ message="${displayName} must not equal to ${fieldName}" />
+ message="${displayName} must be less than ${fieldName}" />
+ message="${displayName} must be greater than ${fieldName}" />
+ message="${displayName} must be less than or equal to ${fieldName}" />
+ greaterThanOrEqualTo="otherField"
+ message="${displayName} must be greater than or equal to ${fieldName}" />
+ message="${displayName} must equal to ${fieldName}" />
+ message="${displayName} must equal to ${fieldName} in case insensitive mode" />
+ message="${displayName} must not equal to ${fieldName}" />
+ message="${displayName} must not equal to ${fieldName} in case insensitive mode"
+ />
+ message="${displayName} must equal to ${fieldName}" />
@@ -155,52 +155,52 @@
+ message="${displayName}" />
+ message="${displayName} must be larger than ${minSize}" />
+ message="${displayName} must be smaller than ${maxSize}" />
+ message="${displayName} should be in size between ${minSize} and ${maxSize}" />
+ message="${displayName} should be of content type ${contentType}" />
+ message="${displayName} should be of content type ${contentType}" />
+ message="${displayName} should be of content type ${contentType} and be in size between ${minSize} and ${maxSize}"
+ />
+ message="${displayName} should be in size between ${minSize} and ${maxSize}" />
+ message="${displayName} should be of ${extension}" />
+ message="${displayName} should be of ${extension}" />
@@ -210,58 +210,58 @@
+ message="${displayName} should be of format ${format}" />
+ message="${displayName} should be after ${minDate}" />
+ message="${displayName} should be earlier than ${maxDate}" />
+ maxDate="1911-10-10 10:10:10"
+ message="${displayName} should be date between ${minDate} and ${maxDate} in format ${format}"
+ />
+ message="${displayName} should match ${pattern}" />
+ message="${displayName} should match ${pattern}" />
+ message="${displayName} should match ${pattern}" />
+ message="${displayName} is not a valid mail address" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="0" p:message="${displayName} validator 1" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="1" p:message="${displayName} validator 2" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="2" p:message="${displayName} validator 3" />
@@ -269,14 +269,14 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="0" p:message="${displayName} validator 1" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="1" p:message="${displayName} validator 2" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="2" p:message="${displayName} validator 3" />
@@ -284,14 +284,14 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="0" p:message="${displayName} validator 1" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="1" p:message="${displayName} validator 2" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="2" p:message="${displayName} validator 3" />
@@ -299,19 +299,19 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:message="${displayName}[${valueIndex}] validator" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:message="${displayName}[${valueIndex}] validator" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:message="${displayName}[${valueIndex}] validator" />
@@ -319,8 +319,8 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:message="${displayName}[${valueIndex}] validator" />
@@ -328,36 +328,36 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:message="${displayName}[${valueIndex}] validator" />
+ message="${displayName} should have values count between ${minCount} and ${maxCount}"
+ />
+ message="${displayName} should have values count between ${minCount} and ${maxCount}"
+ />
+ message="${displayName} should have values count between ${minCount} and ${maxCount}"
+ />
+ message="${displayName} should have values count between ${minCount} and ${maxCount}"
+ />
+ message="${displayName} should have values count between ${minCount} and ${maxCount}"
+ />
@@ -365,12 +365,12 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="0" p:message="${displayName} validator 1" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2" p:index="1"
+ p:message="${displayName} validator 2" />
@@ -378,12 +378,12 @@
otherField.stringValue == "hello"
]]>
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="0" p:message="${displayName} validator 1" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2" p:index="1"
+ p:message="${displayName} validator 2" />
@@ -393,21 +393,21 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="0" p:message="${displayName} validator 1" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="1" p:message="${displayName} validator 2" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="2" p:message="${displayName} validator 3" />
@@ -415,16 +415,16 @@
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="0" p:message="${displayName} validator 1" />
+ class="com.alibaba.citrus.service.form.impl.validation.MyValidator2"
+ p:index="1" p:message="${displayName} validator 2" />
diff --git a/service/form/src/test/config/services-form-with-message-source.xml b/service/form/src/test/config/services-form-with-message-source.xml
index 93b2b9bda..5af3d932d 100644
--- a/service/form/src/test/config/services-form-with-message-source.xml
+++ b/service/form/src/test/config/services-form-with-message-source.xml
@@ -1,11 +1,11 @@
@@ -46,8 +46,8 @@
+ class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
+ p:defaultEncoding="GB18030" xmlns="http://www.springframework.org/schema/beans">
myform
diff --git a/service/form/src/test/config/services-form.xml b/service/form/src/test/config/services-form.xml
index 126bb3689..117bf1f8d 100644
--- a/service/form/src/test/config/services-form.xml
+++ b/service/form/src/test/config/services-form.xml
@@ -1,50 +1,51 @@
+ class="com.alibaba.citrus.service.configuration.support.CustomDateRegistrar"
+ p:timeZone="GMT" />
+ class="com.alibaba.citrus.service.form.impl.MyPropertyEditorRegistrar" />
@@ -52,12 +53,12 @@
@@ -88,13 +89,13 @@
diff --git a/service/form/src/test/config/services-skip-validation.xml b/service/form/src/test/config/services-skip-validation.xml
index 1c113b59f..8de924e86 100644
--- a/service/form/src/test/config/services-skip-validation.xml
+++ b/service/form/src/test/config/services-skip-validation.xml
@@ -1,11 +1,11 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/freemarker/src/main/resources/META-INF/services/template/engines/freemarker-engine.xsd b/service/freemarker/src/main/resources/META-INF/services/template/engines/freemarker-engine.xsd
index 752758348..3f765222b 100644
--- a/service/freemarker/src/main/resources/META-INF/services/template/engines/freemarker-engine.xsd
+++ b/service/freemarker/src/main/resources/META-INF/services/template/engines/freemarker-engine.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -25,7 +25,7 @@
+ minOccurs="0">
+ namespace="http://www.alibaba.com/schema/services/template/engines/freemarker/plugins"
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/freemarker/src/test/config/services-skip-validation.xml b/service/freemarker/src/test/config/services-skip-validation.xml
index 3ea1d83aa..21852f69f 100644
--- a/service/freemarker/src/test/config/services-skip-validation.xml
+++ b/service/freemarker/src/test/config/services-skip-validation.xml
@@ -1,14 +1,14 @@
+ p:charset="GBK" />
+ p:booleanFormat="y,n" />
@@ -75,8 +75,8 @@
+ class="com.alibaba.citrus.service.freemarker.SpringResourceLoaderAdapterTests$NoURLFilter"
+ />
diff --git a/service/freemarker/src/test/config/services_dev.xml b/service/freemarker/src/test/config/services_dev.xml
index 426c940b4..d11ffc911 100644
--- a/service/freemarker/src/test/config/services_dev.xml
+++ b/service/freemarker/src/test/config/services_dev.xml
@@ -1,13 +1,13 @@
+ class="com.alibaba.citrus.service.freemarker.SpringResourceLoaderAdapterTests$NoURLFilter"
+ />
diff --git a/service/freemarker/src/test/config/services_empty_property.xml b/service/freemarker/src/test/config/services_empty_property.xml
index 82fbbace3..3f0671b9c 100644
--- a/service/freemarker/src/test/config/services_empty_property.xml
+++ b/service/freemarker/src/test/config/services_empty_property.xml
@@ -1,13 +1,13 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/jsp/src/main/resources/META-INF/services/template/engines/jsp-engine.xsd b/service/jsp/src/main/resources/META-INF/services/template/engines/jsp-engine.xsd
index f87b99656..551363fd3 100644
--- a/service/jsp/src/main/resources/META-INF/services/template/engines/jsp-engine.xsd
+++ b/service/jsp/src/main/resources/META-INF/services/template/engines/jsp-engine.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/jsp/src/test/config/webapp/WEB-INF/web.xml b/service/jsp/src/test/config/webapp/WEB-INF/web.xml
index 62c26c45d..479a933a2 100644
--- a/service/jsp/src/test/config/webapp/WEB-INF/web.xml
+++ b/service/jsp/src/test/config/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/service/jsp/src/test/config/webapp/services-skip-validation.xml b/service/jsp/src/test/config/webapp/services-skip-validation.xml
index 144df9509..9754acbf8 100644
--- a/service/jsp/src/test/config/webapp/services-skip-validation.xml
+++ b/service/jsp/src/test/config/webapp/services-skip-validation.xml
@@ -1,12 +1,12 @@
+<%@ page pageEncoding="GBK" contentType="text/html; charset=UTF-8" %>
hello, <%=request.getAttribute("hello")%>!
diff --git a/service/jsp/src/test/config/webapp1/WEB-INF/web.xml b/service/jsp/src/test/config/webapp1/WEB-INF/web.xml
index 4f9538a69..70afffc68 100644
--- a/service/jsp/src/test/config/webapp1/WEB-INF/web.xml
+++ b/service/jsp/src/test/config/webapp1/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/service/jsp/src/test/config/webapp1/services.xml b/service/jsp/src/test/config/webapp1/services.xml
index 296d62999..402005845 100644
--- a/service/jsp/src/test/config/webapp1/services.xml
+++ b/service/jsp/src/test/config/webapp1/services.xml
@@ -1,12 +1,12 @@
diff --git a/service/jsp/src/test/config/webapp2/services.xml b/service/jsp/src/test/config/webapp2/services.xml
index 296d62999..402005845 100644
--- a/service/jsp/src/test/config/webapp2/services.xml
+++ b/service/jsp/src/test/config/webapp2/services.xml
@@ -1,12 +1,12 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/mail/src/main/resources/META-INF/services/mails.xsd b/service/mail/src/main/resources/META-INF/services/mails.xsd
index 252503fe7..a2edac7b3 100644
--- a/service/mail/src/main/resources/META-INF/services/mails.xsd
+++ b/service/mail/src/main/resources/META-INF/services/mails.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -73,7 +73,7 @@
+ maxOccurs="unbounded" />
@@ -125,7 +125,7 @@
+ minOccurs="0" />
diff --git a/service/mail/src/main/resources/META-INF/services/mails/contents/alternative-content.xsd b/service/mail/src/main/resources/META-INF/services/mails/contents/alternative-content.xsd
index 970fa8892..2260b7d4b 100644
--- a/service/mail/src/main/resources/META-INF/services/mails/contents/alternative-content.xsd
+++ b/service/mail/src/main/resources/META-INF/services/mails/contents/alternative-content.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mail/src/main/resources/META-INF/services/mails/contents/attachment-content.xsd b/service/mail/src/main/resources/META-INF/services/mails/contents/attachment-content.xsd
index 94adf96c8..6dd10f286 100644
--- a/service/mail/src/main/resources/META-INF/services/mails/contents/attachment-content.xsd
+++ b/service/mail/src/main/resources/META-INF/services/mails/contents/attachment-content.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mail/src/main/resources/META-INF/services/mails/contents/html-template-content.xsd b/service/mail/src/main/resources/META-INF/services/mails/contents/html-template-content.xsd
index 80de4828f..c5d28964c 100644
--- a/service/mail/src/main/resources/META-INF/services/mails/contents/html-template-content.xsd
+++ b/service/mail/src/main/resources/META-INF/services/mails/contents/html-template-content.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mail/src/main/resources/META-INF/services/mails/contents/mixed-content.xsd b/service/mail/src/main/resources/META-INF/services/mails/contents/mixed-content.xsd
index 3c54b054c..a44c65a93 100644
--- a/service/mail/src/main/resources/META-INF/services/mails/contents/mixed-content.xsd
+++ b/service/mail/src/main/resources/META-INF/services/mails/contents/mixed-content.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mail/src/main/resources/META-INF/services/mails/contents/text-content.xsd b/service/mail/src/main/resources/META-INF/services/mails/contents/text-content.xsd
index 8cda26274..0d2baa8b6 100644
--- a/service/mail/src/main/resources/META-INF/services/mails/contents/text-content.xsd
+++ b/service/mail/src/main/resources/META-INF/services/mails/contents/text-content.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mail/src/main/resources/META-INF/services/mails/contents/text-template-content.xsd b/service/mail/src/main/resources/META-INF/services/mails/contents/text-template-content.xsd
index 90c676aac..571f383c0 100644
--- a/service/mail/src/main/resources/META-INF/services/mails/contents/text-template-content.xsd
+++ b/service/mail/src/main/resources/META-INF/services/mails/contents/text-template-content.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mail/src/test/config/services.xml b/service/mail/src/test/config/services.xml
index cbc72f7da..f74d2578f 100644
--- a/service/mail/src/test/config/services.xml
+++ b/service/mail/src/test/config/services.xml
@@ -1,15 +1,15 @@
+ host="alibaba.com" />
+ port="110" protocol="pop3">
30000
+ popBeforeSmtp="mystore" />
+ protocol="smtp">
@@ -69,7 +69,7 @@
]]>
]]>
]]>
- 我的标题 My Subject
+ 我的标题 My Subject
@@ -107,7 +107,7 @@
+ />
@@ -171,7 +171,7 @@
+ constantClass="com.alibaba.citrus.service.mail.MailConstant" />
@@ -189,7 +189,7 @@
+ class="com.alibaba.citrus.service.mail.AbstractMailBuilderTests$NoURLFilter" />
diff --git a/service/mail/src/test/config/services_import_null.xml b/service/mail/src/test/config/services_import_null.xml
index 56dd5f380..12a649edc 100644
--- a/service/mail/src/test/config/services_import_null.xml
+++ b/service/mail/src/test/config/services_import_null.xml
@@ -1,14 +1,14 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules.xsd b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules.xsd
index df8c75593..02d99c404 100644
--- a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules.xsd
+++ b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ namespace="http://www.alibaba.com/schema/services/mapping-rules" />
@@ -36,7 +36,7 @@
+ minOccurs="0" maxOccurs="1" />
@@ -48,7 +48,7 @@
+ minOccurs="0" maxOccurs="1" />
diff --git a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-module-rule.xsd b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-module-rule.xsd
index 56fb77e43..0f345e095 100644
--- a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-module-rule.xsd
+++ b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-module-rule.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-template-rule.xsd b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-template-rule.xsd
index b1d4d3a16..53c176ecf 100644
--- a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-template-rule.xsd
+++ b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/direct-template-rule.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/extension-rule.xsd b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/extension-rule.xsd
index 7235f0083..9ff588713 100644
--- a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/extension-rule.xsd
+++ b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/extension-rule.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-module-rule.xsd b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-module-rule.xsd
index ccf65dbae..04701baba 100644
--- a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-module-rule.xsd
+++ b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-module-rule.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -27,7 +27,7 @@
"about.Default"
"Default"
"DefaultScreen"(即配置文件中指定的默认module名)
-
+
注意,如果上例中DefaultScreen不存在或未指定默认值,则返回最初的结果: about.directions.Driving。
]]>
diff --git a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-template-rule.xsd b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-template-rule.xsd
index cae3ef72e..f01552b54 100644
--- a/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-template-rule.xsd
+++ b/service/mappingrule/src/main/resources/META-INF/services/mapping-rules/fallback-template-rule.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/mappingrule/src/test/config/services-parent.xml b/service/mappingrule/src/test/config/services-parent.xml
index d677e9ce6..935e8c7c9 100644
--- a/service/mappingrule/src/test/config/services-parent.xml
+++ b/service/mappingrule/src/test/config/services-parent.xml
@@ -1,13 +1,13 @@
@@ -28,9 +28,9 @@
+ class="com.alibaba.citrus.service.mappingrule.impl.SimpleEngine" p:extensions="vm" />
+ class="com.alibaba.citrus.service.mappingrule.impl.SimpleEngine" p:extensions="jsp" />
diff --git a/service/mappingrule/src/test/config/services.xml b/service/mappingrule/src/test/config/services.xml
index e31657358..00a123cf9 100644
--- a/service/mappingrule/src/test/config/services.xml
+++ b/service/mappingrule/src/test/config/services.xml
@@ -1,19 +1,19 @@
@@ -31,9 +31,9 @@
+ class="com.alibaba.citrus.service.mappingrule.impl.SimpleEngine" p:extensions="vm" />
+ class="com.alibaba.citrus.service.mappingrule.impl.SimpleEngine" p:extensions="jsp" />
@@ -52,7 +52,7 @@
+ templatePrefix="myprefix.locale" />
@@ -98,13 +98,13 @@
+ templatePrefix="myprefix" />
+ moduleType="screen" moduleLoaderServiceRef="moduleLoaderService" />
+ templatePrefix="myprefix" templateServiceRef="templateService" />
diff --git a/service/moduleloader/pom.xml b/service/moduleloader/pom.xml
index e0e36aad9..392b22258 100644
--- a/service/moduleloader/pom.xml
+++ b/service/moduleloader/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/moduleloader/src/main/resources/META-INF/services/module-loader.xsd b/service/moduleloader/src/main/resources/META-INF/services/module-loader.xsd
index 512a872a5..65c95a1ed 100644
--- a/service/moduleloader/src/main/resources/META-INF/services/module-loader.xsd
+++ b/service/moduleloader/src/main/resources/META-INF/services/module-loader.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,14 +20,14 @@
+ minOccurs="0" maxOccurs="unbounded" />
+ minOccurs="0" maxOccurs="unbounded" />
+ default="true" />
diff --git a/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/action-event-adapter.xsd b/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/action-event-adapter.xsd
index bdd9f7ab2..00bebf8f8 100644
--- a/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/action-event-adapter.xsd
+++ b/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/action-event-adapter.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/data-binding-adapter.xsd b/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/data-binding-adapter.xsd
index 5ef950255..397e87e06 100644
--- a/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/data-binding-adapter.xsd
+++ b/service/moduleloader/src/main/resources/META-INF/services/module-loader/adapters/data-binding-adapter.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/class-modules.xsd b/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/class-modules.xsd
index 3af6e741b..fb5fc0c20 100644
--- a/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/class-modules.xsd
+++ b/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/class-modules.xsd
@@ -1,16 +1,16 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/module-loader/factories/factories-base.xsd" />
@@ -68,7 +68,7 @@
+ maxOccurs="unbounded">
+ maxOccurs="unbounded">
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/script-modules.xsd b/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/script-modules.xsd
index 762a00999..b751c5b67 100644
--- a/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/script-modules.xsd
+++ b/service/moduleloader/src/main/resources/META-INF/services/module-loader/factories/script-modules.xsd
@@ -1,12 +1,12 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/module-loader/factories/factories-base.xsd" />
diff --git a/service/moduleloader/src/test/config/adapter/services-lazyinit.xml b/service/moduleloader/src/test/config/adapter/services-lazyinit.xml
index 671410f96..17678e827 100644
--- a/service/moduleloader/src/test/config/adapter/services-lazyinit.xml
+++ b/service/moduleloader/src/test/config/adapter/services-lazyinit.xml
@@ -1,11 +1,11 @@
+ defaultAutowireMode="byType" defaultLazyInit="true" />
diff --git a/service/moduleloader/src/test/config/adapter/services.xml b/service/moduleloader/src/test/config/adapter/services.xml
index 7e1a6ce31..070d7444f 100644
--- a/service/moduleloader/src/test/config/adapter/services.xml
+++ b/service/moduleloader/src/test/config/adapter/services.xml
@@ -1,11 +1,11 @@
+ defaultAutowireMode="byType" />
diff --git a/service/moduleloader/src/test/config/base-dev.xml b/service/moduleloader/src/test/config/base-dev.xml
index 36c23421e..a1d0c8d44 100644
--- a/service/moduleloader/src/test/config/base-dev.xml
+++ b/service/moduleloader/src/test/config/base-dev.xml
@@ -1,13 +1,13 @@
+ xmlns="http://www.alibaba.com/schema/services/data-resolver/factories">
diff --git a/service/moduleloader/src/test/config/factory/services-class-modules-wrong.xml b/service/moduleloader/src/test/config/factory/services-class-modules-wrong.xml
index 6293c5021..4b57fa998 100644
--- a/service/moduleloader/src/test/config/factory/services-class-modules-wrong.xml
+++ b/service/moduleloader/src/test/config/factory/services-class-modules-wrong.xml
@@ -1,13 +1,13 @@
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
diff --git a/service/moduleloader/src/test/config/factory/services-class-modules.xml b/service/moduleloader/src/test/config/factory/services-class-modules.xml
index fa02bc685..2a39e9ad3 100644
--- a/service/moduleloader/src/test/config/factory/services-class-modules.xml
+++ b/service/moduleloader/src/test/config/factory/services-class-modules.xml
@@ -1,13 +1,13 @@
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
@@ -52,55 +52,55 @@
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ defaultAutowireMode="byType" />
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ includeAbstractClasses="true" />
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ includeAbstractClasses="true" />
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ includeAbstractClasses="true">
+ expression="com.alibaba.test3.app2.filter.MyTypeFilter" />
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ includeAbstractClasses="true">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ includeAbstractClasses="true">
diff --git a/service/moduleloader/src/test/config/factory/services-script-modules-wrong.xml b/service/moduleloader/src/test/config/factory/services-script-modules-wrong.xml
index 4c2874b46..cb3ef6f2b 100644
--- a/service/moduleloader/src/test/config/factory/services-script-modules-wrong.xml
+++ b/service/moduleloader/src/test/config/factory/services-script-modules-wrong.xml
@@ -1,15 +1,15 @@
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
diff --git a/service/moduleloader/src/test/config/services-module-loader.xml b/service/moduleloader/src/test/config/services-module-loader.xml
index b2fd1392d..8a7c1d50d 100644
--- a/service/moduleloader/src/test/config/services-module-loader.xml
+++ b/service/moduleloader/src/test/config/services-module-loader.xml
@@ -1,13 +1,13 @@
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories"
+ includeDefaultAdapters="true">
+ class="com.alibaba.citrus.service.moduleloader.ModuleLoaderServiceTests$MySimpleAdapterFactory"
+ />
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories"
+ includeDefaultAdapters="false">
+ class="com.alibaba.citrus.service.moduleloader.ModuleLoaderServiceTests$MySimpleAdapterFactory"
+ />
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ xmlns="http://www.alibaba.com/schema/services/module-loader/factories">
+ defaultLazyInit="true" />
diff --git a/service/moduleloader/src/test/config/services-skip-validation.xml b/service/moduleloader/src/test/config/services-skip-validation.xml
index 4b8ac97c7..7164f2aca 100644
--- a/service/moduleloader/src/test/config/services-skip-validation.xml
+++ b/service/moduleloader/src/test/config/services-skip-validation.xml
@@ -1,13 +1,13 @@
+ packages="com.alibaba.citrus.service.moduleloader">
diff --git a/service/pipeline/pom.xml b/service/pipeline/pom.xml
index b8b354a53..631b82d44 100644
--- a/service/pipeline/pom.xml
+++ b/service/pipeline/pom.xml
@@ -1,6 +1,6 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline.xsd
index bdf525292..e0e8d655b 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/all-of.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/all-of.xsd
index 057038713..1c282024f 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/all-of.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/all-of.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -21,7 +21,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/any-of.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/any-of.xsd
index a50915e64..615ed816a 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/any-of.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/any-of.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -21,7 +21,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/jexl-condition.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/jexl-condition.xsd
index 4cb5d98cf..8929383f4 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/jexl-condition.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/jexl-condition.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/none-of.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/none-of.xsd
index 4389a6347..3374a9703 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/none-of.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/conditions/none-of.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -21,7 +21,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-if.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-if.xsd
index f8320f62d..9b562270a 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-if.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-if.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-unless.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-unless.xsd
index 3385893e0..5f6604f11 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-unless.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break-unless.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break.xsd
index 5657e2749..8bd298e78 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/break.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/choose.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/choose.xsd
index f1d58e931..3b962c679 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/choose.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/choose.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -28,9 +28,9 @@
+ minOccurs="0" />
+ minOccurs="0" maxOccurs="unbounded" />
@@ -39,7 +39,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/exit.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/exit.xsd
index 98af4f96b..bbecd70be 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/exit.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/exit.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/if.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/if.xsd
index 7963cbb5e..798c2e53d 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/if.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/if.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,9 +20,9 @@
+ minOccurs="0" />
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/loop.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/loop.xsd
index 2b57fb80d..b63f23fb5 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/loop.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/loop.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/sub-pipeline.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/sub-pipeline.xsd
index e58ec7062..739576387 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/sub-pipeline.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/sub-pipeline.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/try-catch-finally.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/try-catch-finally.xsd
index 2bebede45..e07d77400 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/try-catch-finally.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/try-catch-finally.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -37,7 +37,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/while.xsd b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/while.xsd
index dbd7d29b9..d64bf947d 100644
--- a/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/while.xsd
+++ b/service/pipeline/src/main/resources/META-INF/services/pipeline/valves/while.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,9 +20,9 @@
+ minOccurs="0" />
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/pipeline/src/test/config/services-conditions.xml b/service/pipeline/src/test/config/services-conditions.xml
index c7fcbc302..3d2aabfeb 100644
--- a/service/pipeline/src/test/config/services-conditions.xml
+++ b/service/pipeline/src/test/config/services-conditions.xml
@@ -1,10 +1,10 @@
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
+ class="com.alibaba.citrus.service.pipeline.condition.MyCondition" />
diff --git a/service/pipeline/src/test/config/services-pipeline.xml b/service/pipeline/src/test/config/services-pipeline.xml
index 8f1d676a3..46e173b1f 100644
--- a/service/pipeline/src/test/config/services-pipeline.xml
+++ b/service/pipeline/src/test/config/services-pipeline.xml
@@ -1,10 +1,10 @@
+ class="com.alibaba.citrus.service.pipeline.PipelineServiceTests$TestOnlyScope"
+ />
diff --git a/service/pipeline/src/test/config/services-valves.xml b/service/pipeline/src/test/config/services-valves.xml
index 725f94358..256efdb3b 100644
--- a/service/pipeline/src/test/config/services-valves.xml
+++ b/service/pipeline/src/test/config/services-valves.xml
@@ -1,11 +1,11 @@
+ p:name="myexception" />
diff --git a/service/pipeline/src/test/resources/META-INF/services/pipeline/valves/log.xsd b/service/pipeline/src/test/resources/META-INF/services/pipeline/valves/log.xsd
index f9885b784..e55245c33 100644
--- a/service/pipeline/src/test/resources/META-INF/services/pipeline/valves/log.xsd
+++ b/service/pipeline/src/test/resources/META-INF/services/pipeline/valves/log.xsd
@@ -1,16 +1,16 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
-
+
diff --git a/service/pull/pom.xml b/service/pull/pom.xml
index c4b491bff..d2e6708d9 100644
--- a/service/pull/pom.xml
+++ b/service/pull/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/pull/src/main/resources/META-INF/services/pull.xsd b/service/pull/src/main/resources/META-INF/services/pull.xsd
index 67ad4dba8..e82dced63 100644
--- a/service/pull/src/main/resources/META-INF/services/pull.xsd
+++ b/service/pull/src/main/resources/META-INF/services/pull.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ maxOccurs="unbounded" />
diff --git a/service/pull/src/main/resources/META-INF/services/pull/factories/bean-tool.xsd b/service/pull/src/main/resources/META-INF/services/pull/factories/bean-tool.xsd
index 4caa63810..5da66ad9a 100644
--- a/service/pull/src/main/resources/META-INF/services/pull/factories/bean-tool.xsd
+++ b/service/pull/src/main/resources/META-INF/services/pull/factories/bean-tool.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -30,7 +30,7 @@
+ />
diff --git a/service/pull/src/main/resources/META-INF/services/pull/factories/constants.xsd b/service/pull/src/main/resources/META-INF/services/pull/factories/constants.xsd
index 2c6bedbed..2bc71481e 100644
--- a/service/pull/src/main/resources/META-INF/services/pull/factories/constants.xsd
+++ b/service/pull/src/main/resources/META-INF/services/pull/factories/constants.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -22,7 +22,7 @@
+ />
diff --git a/service/pull/src/main/resources/META-INF/services/pull/factories/context-exposer.xsd b/service/pull/src/main/resources/META-INF/services/pull/factories/context-exposer.xsd
index 22dc2056e..905b9c073 100644
--- a/service/pull/src/main/resources/META-INF/services/pull/factories/context-exposer.xsd
+++ b/service/pull/src/main/resources/META-INF/services/pull/factories/context-exposer.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/pull/src/main/resources/META-INF/services/pull/factories/mixin.xsd b/service/pull/src/main/resources/META-INF/services/pull/factories/mixin.xsd
index cb926a3e6..759e34a07 100644
--- a/service/pull/src/main/resources/META-INF/services/pull/factories/mixin.xsd
+++ b/service/pull/src/main/resources/META-INF/services/pull/factories/mixin.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -22,7 +22,7 @@
+ maxOccurs="unbounded" />
diff --git a/service/pull/src/main/resources/META-INF/services/pull/factories/utils.xsd b/service/pull/src/main/resources/META-INF/services/pull/factories/utils.xsd
index 49855d8a0..9310b6146 100644
--- a/service/pull/src/main/resources/META-INF/services/pull/factories/utils.xsd
+++ b/service/pull/src/main/resources/META-INF/services/pull/factories/utils.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/pull/src/test/config/pull/services-pull-names.xml b/service/pull/src/test/config/pull/services-pull-names.xml
index 1f6c30751..0e6035b71 100644
--- a/service/pull/src/test/config/pull/services-pull-names.xml
+++ b/service/pull/src/test/config/pull/services-pull-names.xml
@@ -1,10 +1,10 @@
+ exposed="false" />
@@ -37,7 +37,7 @@
+ scope="global" />
diff --git a/service/pull/src/test/config/pull/services-pull-parent.xml b/service/pull/src/test/config/pull/services-pull-parent.xml
index 178370afa..2f2b1c6a7 100644
--- a/service/pull/src/test/config/pull/services-pull-parent.xml
+++ b/service/pull/src/test/config/pull/services-pull-parent.xml
@@ -1,10 +1,10 @@
+ p:singleton="true" />
+ p:singleton="true" p:id="parentSingleton3" />
+ p:singleton="false" />
+ p:singleton="false" p:id="parentPrototype3" />
+ class="com.alibaba.citrus.service.pull.tool.ObjectRuntimeToolSet" p:idParam="parent" />
diff --git a/service/pull/src/test/config/pull/services-pull-sub.xml b/service/pull/src/test/config/pull/services-pull-sub.xml
index 06174028a..969584cc5 100644
--- a/service/pull/src/test/config/pull/services-pull-sub.xml
+++ b/service/pull/src/test/config/pull/services-pull-sub.xml
@@ -1,10 +1,10 @@
+ p:singleton="true" />
+ p:singleton="true" p:id="subSingleton3" />
+ p:singleton="false" />
+ p:singleton="false" p:id="subPrototype3" />
+ p:idParam="sub" />
diff --git a/service/pull/src/test/config/pull/services-pull-tool.xml b/service/pull/src/test/config/pull/services-pull-tool.xml
index 210052b33..c9cf838b0 100644
--- a/service/pull/src/test/config/pull/services-pull-tool.xml
+++ b/service/pull/src/test/config/pull/services-pull-tool.xml
@@ -1,10 +1,10 @@
+ class="com.alibaba.citrus.service.pull.AbstractPullServiceConfigTests$InnerBean"
+ scope="global" />
+ class="com.alibaba.citrus.service.pull.AbstractPullServiceConfigTests$InnerBean"
+ scope="global" autowire="true" />
+ class="com.alibaba.citrus.service.pull.AbstractPullServiceConfigTests$InnerBean"
+ scope="request" />
+ class="com.alibaba.citrus.service.pull.AbstractPullServiceConfigTests$InnerBean"
+ scope="request" autowire="true" />
diff --git a/service/pull/src/test/config/pull/services-pull-wrong-dup-id.xml b/service/pull/src/test/config/pull/services-pull-wrong-dup-id.xml
index 386fa2fd8..f3a6cd168 100644
--- a/service/pull/src/test/config/pull/services-pull-wrong-dup-id.xml
+++ b/service/pull/src/test/config/pull/services-pull-wrong-dup-id.xml
@@ -1,10 +1,10 @@
+ exposed="false" />
+ p:singleton="false" />
+ p:singleton="false" p:id="inset1" />
@@ -54,13 +54,13 @@
+ map-class="java.util.LinkedHashMap" value-type="java.lang.Integer">
+ value-type="java.lang.Integer">
333
444
555
diff --git a/service/pull/src/test/config/services-skip-validation.xml b/service/pull/src/test/config/services-skip-validation.xml
index 57227cce4..d920b3bfe 100644
--- a/service/pull/src/test/config/services-skip-validation.xml
+++ b/service/pull/src/test/config/services-skip-validation.xml
@@ -1,10 +1,10 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/requestcontext/pom.xml b/service/requestcontext/pom.xml
index a66f76dd9..5b25cb038 100644
--- a/service/requestcontext/pom.xml
+++ b/service/requestcontext/pom.xml
@@ -1,6 +1,6 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts.xsd
index 83c00b947..0a137c17a 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -23,7 +23,7 @@
+ default="false" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic.xsd
index b0f4729a7..4a083959b 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -22,7 +22,7 @@
+ minOccurs="0">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/basic/interceptors"
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic/interceptors/response-header-security-filter.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic/interceptors/response-header-security-filter.xsd
index 3c494de8a..f9ff924b7 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic/interceptors/response-header-security-filter.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/basic/interceptors/response-header-security-filter.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/buffered.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/buffered.xsd
index 46b5912a5..4d95173a8 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/buffered.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/buffered.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/lazy-commit.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/lazy-commit.xsd
index 230b28954..2e9669ffe 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/lazy-commit.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/lazy-commit.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser.xsd
index f431ccc59..b0969b61f 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -22,7 +22,7 @@
+ type="springext:referenceableBeanType" minOccurs="0" maxOccurs="unbounded">
+ default="true">
+ default="true">
+ default="true">
+ default="false">
+ default="true">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/parser/filters"
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser/filters/uploaded-file-whitelist.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser/filters/uploaded-file-whitelist.xsd
index 1e9be3096..41ca4fa90 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser/filters/uploaded-file-whitelist.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/parser/filters/uploaded-file-whitelist.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rewrite.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rewrite.xsd
index 9f3f1806e..f13416d8e 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rewrite.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rewrite.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -18,7 +18,7 @@
+ maxOccurs="unbounded">
+ maxOccurs="unbounded">
+ minOccurs="0">
+ minOccurs="0" maxOccurs="unbounded">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/rewrite/handlers"
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rundata.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rundata.xsd
index 36fc6f33f..cb05c581d 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rundata.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/rundata.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session.xsd
index 4977a90d6..e5573d65e 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -29,7 +29,7 @@
+ minOccurs="0">
+ type="SessionRequestContextSessionStoreMappingsType" minOccurs="0">
+ type="SessionRequestContextSessionModelEncodersType" minOccurs="0">
+ type="SessionRequestContextSessionInterceptorsType" minOccurs="0">
+ default="false">
+ default="true">
+ default="false">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/idgens"
+ minOccurs="0" />
@@ -190,8 +190,8 @@
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/stores"
+ />
@@ -225,16 +225,16 @@
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/model-encoders"
+ minOccurs="0" maxOccurs="unbounded" />
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/interceptors"
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encoders/serialization-encoder.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encoders/serialization-encoder.xsd
index d0218c28b..f0737b48a 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encoders/serialization-encoder.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encoders/serialization-encoder.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
@@ -18,11 +18,11 @@
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/serializers"
+ minOccurs="0" />
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/encrypters"
+ minOccurs="0" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encrypters/aes-encrypter.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encrypters/aes-encrypter.xsd
index cda8cb1ec..4b03904ed 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encrypters/aes-encrypter.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/encrypters/aes-encrypter.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/random-id-generator.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/random-id-generator.xsd
index fac5ee9e6..937bd536d 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/random-id-generator.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/random-id-generator.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/uuid-generator.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/uuid-generator.xsd
index bef358e00..358ea4bcb 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/uuid-generator.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/idgens/uuid-generator.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/interceptors/attribute-whitelist.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/interceptors/attribute-whitelist.xsd
index 8e689a016..a3e2d391b 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/interceptors/attribute-whitelist.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/interceptors/attribute-whitelist.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded">
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/model-encoders/default-session-model-encoder.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/model-encoders/default-session-model-encoder.xsd
index 1f879c5a4..bfb6e0ca5 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/model-encoders/default-session-model-encoder.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/model-encoders/default-session-model-encoder.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/hessian-serializer.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/hessian-serializer.xsd
index 3cd85dbf8..387e9daa4 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/hessian-serializer.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/hessian-serializer.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/java-serializer.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/java-serializer.xsd
index 6eb5ac021..76d2482ed 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/java-serializer.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/serializers/java-serializer.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/cookie-store.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/cookie-store.xsd
index 35b515975..fc75b6ec7 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/cookie-store.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/cookie-store.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -71,7 +71,7 @@
+ type="springext:booleanOrPlaceholder" default="false">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/encoders"
+ />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/simple-memory-store.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/simple-memory-store.xsd
index 969b2d7fb..63030f6db 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/simple-memory-store.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/simple-memory-store.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/single-valued-cookie-store.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/single-valued-cookie-store.xsd
index 68ccdedb7..d0bc33241 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/single-valued-cookie-store.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/stores/single-valued-cookie-store.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -71,7 +71,7 @@
+ type="springext:booleanOrPlaceholder" default="false">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/value-encoders"
+ />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/mapped-values-encoder.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/mapped-values-encoder.xsd
index 133c8bbca..bfc8b3d27 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/mapped-values-encoder.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/mapped-values-encoder.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/encrypters"
+ minOccurs="0" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/simple-value-encoder.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/simple-value-encoder.xsd
index 401fa60be..1beb6a7ac 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/simple-value-encoder.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/session/value-encoders/simple-value-encoder.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded">
+ namespace="http://www.alibaba.com/schema/services/request-contexts/session/encrypters"
+ minOccurs="0" />
diff --git a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/set-locale.xsd b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/set-locale.xsd
index 93a2a4bb7..908b2de5e 100644
--- a/service/requestcontext/src/main/resources/META-INF/services/request-contexts/set-locale.xsd
+++ b/service/requestcontext/src/main/resources/META-INF/services/request-contexts/set-locale.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/requestcontext/src/test/config/WEB-INF/web.xml b/service/requestcontext/src/test/config/WEB-INF/web.xml
index 8130fa2e0..88e486a35 100644
--- a/service/requestcontext/src/test/config/WEB-INF/web.xml
+++ b/service/requestcontext/src/test/config/WEB-INF/web.xml
@@ -1,13 +1,14 @@
servlet
- com.alibaba.citrus.service.requestcontext.AbstractRequestContextsTests$NoopServlet
+ com.alibaba.citrus.service.requestcontext.AbstractRequestContextsTests$NoopServlet
+
diff --git a/service/requestcontext/src/test/config/empty.xml b/service/requestcontext/src/test/config/empty.xml
index bb9cef469..66e1fc17c 100644
--- a/service/requestcontext/src/test/config/empty.xml
+++ b/service/requestcontext/src/test/config/empty.xml
@@ -1,6 +1,6 @@
+ ">
diff --git a/service/requestcontext/src/test/config/encoders.xml b/service/requestcontext/src/test/config/encoders.xml
index 8c7a6e057..ad5de5a6d 100644
--- a/service/requestcontext/src/test/config/encoders.xml
+++ b/service/requestcontext/src/test/config/encoders.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+ xmlns="http://www.alibaba.com/schema/services/request-contexts/basic/interceptors">
+
+ class="com.alibaba.citrus.service.requestcontext.basic.BasicRequestContextTests$MyInterceptor"
+ />
@@ -35,10 +35,10 @@
+ xmlns="http://www.alibaba.com/schema/services/request-contexts/basic/interceptors">
+ class="com.alibaba.citrus.service.requestcontext.basic.BasicRequestContextTests$MyInterceptor"
+ />
diff --git a/service/requestcontext/src/test/config/services-buffered.xml b/service/requestcontext/src/test/config/services-buffered.xml
index 84299bf1b..2a6541339 100644
--- a/service/requestcontext/src/test/config/services-buffered.xml
+++ b/service/requestcontext/src/test/config/services-buffered.xml
@@ -1,10 +1,10 @@
+ paramKey="_lang" sessionKey="_lang" defaultLocale="zh_CN" defaultCharset="UTF-8" />
diff --git a/service/requestcontext/src/test/config/services-parser.xml b/service/requestcontext/src/test/config/services-parser.xml
index 118d92a32..b0be554d2 100644
--- a/service/requestcontext/src/test/config/services-parser.xml
+++ b/service/requestcontext/src/test/config/services-parser.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.service.requestcontext.parser.ValueParserTests$MyRegistrar"
+ />
+ class="com.alibaba.citrus.service.requestcontext.parser.ValueParserTests$MyRegistrar"
+ />
@@ -39,13 +39,13 @@
+ htmlFieldSuffix=".~html" unescapeParameters="true" useServletEngineParser="false"
+ useBodyEncodingForURI="true" URIEncoding="UTF-8" trimming="true"
+ uploadServiceRef="uploadService">
+ class="com.alibaba.citrus.service.requestcontext.parser.filter.HTMLParameterValueFilter"
+ />
@@ -55,9 +55,9 @@
+ class="com.alibaba.citrus.service.requestcontext.parser.filter.HTMLParameterValueFilter" />
+ extensions="jpg, .gif, png" />
@@ -65,9 +65,9 @@
+ class="com.alibaba.citrus.service.requestcontext.parser.filter.HTMLParameterValueFilter" />
+ />
diff --git a/service/requestcontext/src/test/config/services-rewrite.xml b/service/requestcontext/src/test/config/services-rewrite.xml
index 9ec317b13..d1c2d857b 100644
--- a/service/requestcontext/src/test/config/services-rewrite.xml
+++ b/service/requestcontext/src/test/config/services-rewrite.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.service.requestcontext.rewrite.support.UrlNormalizer"
+ />
diff --git a/service/requestcontext/src/test/config/services-rundata.xml b/service/requestcontext/src/test/config/services-rundata.xml
index 164453916..b64a8395c 100644
--- a/service/requestcontext/src/test/config/services-rundata.xml
+++ b/service/requestcontext/src/test/config/services-rundata.xml
@@ -1,10 +1,10 @@
+ class="com.alibaba.citrus.service.requestcontext.session.SessionInterceptorTests$MySessionLifecycleListener" />
+ class="com.alibaba.citrus.service.requestcontext.session.SessionInterceptorTests$MySessionAttributeInterceptor"
+ />
@@ -53,7 +53,7 @@
+ visitLogLevel="debug" />
diff --git a/service/requestcontext/src/test/config/services-session-single-valued-cookie-stores.xml b/service/requestcontext/src/test/config/services-session-single-valued-cookie-stores.xml
index afceba8f4..777eb115b 100644
--- a/service/requestcontext/src/test/config/services-session-single-valued-cookie-stores.xml
+++ b/service/requestcontext/src/test/config/services-session-single-valued-cookie-stores.xml
@@ -1,15 +1,15 @@
+ class="com.alibaba.citrus.service.configuration.support.CustomDateRegistrar" />
diff --git a/service/requestcontext/src/test/config/services-session.xml b/service/requestcontext/src/test/config/services-session.xml
index 64b05ef85..f5c917fd0 100644
--- a/service/requestcontext/src/test/config/services-session.xml
+++ b/service/requestcontext/src/test/config/services-session.xml
@@ -1,14 +1,14 @@
+ class="com.alibaba.citrus.service.requestcontext.session.SessionTests$MyExactMatchesOnlySessionStore"
+ />
@@ -75,8 +75,8 @@
+ class="com.alibaba.citrus.service.requestcontext.session.SessionTests$MyExactMatchesOnlySessionStore"
+ />
@@ -91,8 +91,8 @@
+ class="com.alibaba.citrus.service.requestcontext.session.SessionTests$MyExactMatchesOnlySessionStore"
+ />
@@ -168,7 +168,7 @@
+ secure="true" />
diff --git a/service/requestcontext/src/test/config/services-skip-validation.xml b/service/requestcontext/src/test/config/services-skip-validation.xml
index 1bcb0a627..c0a094cd3 100644
--- a/service/requestcontext/src/test/config/services-skip-validation.xml
+++ b/service/requestcontext/src/test/config/services-skip-validation.xml
@@ -1,16 +1,16 @@
+ class="com.alibaba.citrus.service.requestcontext.RequestContextChainingServiceTests$MyRequestContextFactory"
+ abstract="true" />
@@ -82,8 +82,8 @@
+ class="com.alibaba.citrus.service.requestcontext.dummy.DummyRequestContextFactoryImpl"
+ />
diff --git a/service/resource/pom.xml b/service/resource/pom.xml
index 944bcec39..2372abafa 100644
--- a/service/resource/pom.xml
+++ b/service/resource/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/resource/src/main/resources/META-INF/services/resource-loading.xsd b/service/resource/src/main/resources/META-INF/services/resource-loading.xsd
index 12795bf16..57097ce75 100644
--- a/service/resource/src/main/resources/META-INF/services/resource-loading.xsd
+++ b/service/resource/src/main/resources/META-INF/services/resource-loading.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/resource/src/main/resources/META-INF/services/resource-loading/filters/xslt-filter.xsd b/service/resource/src/main/resources/META-INF/services/resource-loading/filters/xslt-filter.xsd
index 176b9d988..b6b996343 100644
--- a/service/resource/src/main/resources/META-INF/services/resource-loading/filters/xslt-filter.xsd
+++ b/service/resource/src/main/resources/META-INF/services/resource-loading/filters/xslt-filter.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -23,7 +23,7 @@
+ default="true" />
diff --git a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/classpath-loader.xsd b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/classpath-loader.xsd
index 071bf06a4..182d14a1b 100644
--- a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/classpath-loader.xsd
+++ b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/classpath-loader.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/file-loader.xsd b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/file-loader.xsd
index 3f4aab473..476c1a04d 100644
--- a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/file-loader.xsd
+++ b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/file-loader.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/super-loader.xsd b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/super-loader.xsd
index eb1bfd67c..ef4e2ca49 100644
--- a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/super-loader.xsd
+++ b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/super-loader.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/webapp-loader.xsd b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/webapp-loader.xsd
index 758c3fcc7..532578227 100644
--- a/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/webapp-loader.xsd
+++ b/service/resource/src/main/resources/META-INF/services/resource-loading/loaders/webapp-loader.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/resource/src/test/config/WEB-INF/resources.xml b/service/resource/src/test/config/WEB-INF/resources.xml
index 291ff9f6a..9a2ee2897 100644
--- a/service/resource/src/test/config/WEB-INF/resources.xml
+++ b/service/resource/src/test/config/WEB-INF/resources.xml
@@ -1,11 +1,11 @@
+ parentRef="myParentResourceLoadingService" />
@@ -67,15 +67,15 @@
+ class="com.alibaba.citrus.service.resource.ResourceLoadingServiceTests$NoURLFilter"
+ />
+ class="com.alibaba.citrus.service.resource.ResourceLoadingServiceTests$NoStreamFilter"
+ />
diff --git a/service/resource/src/test/config/WEB-INF/web.xml b/service/resource/src/test/config/WEB-INF/web.xml
index 7146a1008..545471aee 100644
--- a/service/resource/src/test/config/WEB-INF/web.xml
+++ b/service/resource/src/test/config/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/service/resource/src/test/config/appcontext/services-parent.xml b/service/resource/src/test/config/appcontext/services-parent.xml
index b4030ae63..dce526e8b 100644
--- a/service/resource/src/test/config/appcontext/services-parent.xml
+++ b/service/resource/src/test/config/appcontext/services-parent.xml
@@ -1,18 +1,18 @@
-
+
-
+
diff --git a/service/resource/src/test/config/appcontext/services1.xml b/service/resource/src/test/config/appcontext/services1.xml
index 76cbde023..0175b69bc 100644
--- a/service/resource/src/test/config/appcontext/services1.xml
+++ b/service/resource/src/test/config/appcontext/services1.xml
@@ -1,19 +1,19 @@
-
+
-
+
diff --git a/service/resource/src/test/config/appcontext/services2.xml b/service/resource/src/test/config/appcontext/services2.xml
index b95543cab..2ec2106ba 100644
--- a/service/resource/src/test/config/appcontext/services2.xml
+++ b/service/resource/src/test/config/appcontext/services2.xml
@@ -1,10 +1,10 @@
diff --git a/service/resource/src/test/config/beans.xml b/service/resource/src/test/config/beans.xml
index 8faf44dfb..d21873ba3 100644
--- a/service/resource/src/test/config/beans.xml
+++ b/service/resource/src/test/config/beans.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.service.resource.SpringIntegrationTests$MyLoader">
+ class="com.alibaba.citrus.service.resource.SpringIntegrationTests$MyBean">
diff --git a/service/resource/src/test/config/filter/xslt-filter.xml b/service/resource/src/test/config/filter/xslt-filter.xml
index d3bb26c6b..40518d5a8 100644
--- a/service/resource/src/test/config/filter/xslt-filter.xml
+++ b/service/resource/src/test/config/filter/xslt-filter.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.service.resource.loader.WebappLoaderIntegratingTests$FactoryBeanUsingResource"
+ p:location="/webroot/test.txt" p:type="java.lang.String" />
diff --git a/service/resource/src/test/config/myfolder/test.xsl b/service/resource/src/test/config/myfolder/test.xsl
index fd0764262..a6974469a 100644
--- a/service/resource/src/test/config/myfolder/test.xsl
+++ b/service/resource/src/test/config/myfolder/test.xsl
@@ -3,13 +3,13 @@
-
+
-
+
diff --git a/service/resource/src/test/config/resources-root.xml b/service/resource/src/test/config/resources-root.xml
index ce28a3245..997e560cd 100644
--- a/service/resource/src/test/config/resources-root.xml
+++ b/service/resource/src/test/config/resources-root.xml
@@ -1,11 +1,11 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/template/src/main/resources/META-INF/services/template.xsd b/service/template/src/main/resources/META-INF/services/template.xsd
index 79f9ade29..4673648db 100644
--- a/service/template/src/main/resources/META-INF/services/template.xsd
+++ b/service/template/src/main/resources/META-INF/services/template.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded">
+ class="com.alibaba.citrus.service.template.impl.SimpleEngine" />
+ class="com.alibaba.citrus.service.template.impl.SimpleEngine" />
diff --git a/service/template/src/test/config/template-noEngineName.xml b/service/template/src/test/config/template-noEngineName.xml
index 2d4c3c876..4ec5b4cf2 100644
--- a/service/template/src/test/config/template-noEngineName.xml
+++ b/service/template/src/test/config/template-noEngineName.xml
@@ -1,10 +1,10 @@
+ class="com.alibaba.citrus.service.template.impl.SimpleEngine" />
diff --git a/service/template/src/test/config/template-noExtension.xml b/service/template/src/test/config/template-noExtension.xml
index a1f0855d7..58a5bc43d 100644
--- a/service/template/src/test/config/template-noExtension.xml
+++ b/service/template/src/test/config/template-noExtension.xml
@@ -1,10 +1,10 @@
+ class="com.alibaba.citrus.service.template.impl.SimpleEngine" />
diff --git a/service/template/src/test/config/template.xml b/service/template/src/test/config/template.xml
index 83ed4e500..762cca7d2 100644
--- a/service/template/src/test/config/template.xml
+++ b/service/template/src/test/config/template.xml
@@ -1,10 +1,10 @@
+ class="com.alibaba.citrus.service.template.impl.SimpleEngine" />
+ class="com.alibaba.citrus.service.template.impl.SimpleEngine" p:extensions=" vm " />
+ class="com.alibaba.citrus.service.template.impl.SimpleEngine"
+ p:extensions=" .jsp, jhtml " />
+ p:extensions=" vm " p:basedir="dir1" />
+ p:extensions=" .jsp, jhtml " p:basedir="dir2" />
+ p:extensions=" vm " p:basedir="dir1" />
+ p:extensions=" .jsp, jhtml " p:basedir="dir2" />
+ p:extensions=" vm " p:basedir="dir1" />
+ p:extensions=" .jsp, jhtml " p:basedir="dir2" />
+ p:extensions=" vm " p:basedir="dir1" />
+ p:extensions=" .jsp, jhtml " p:basedir="dir2" />
diff --git a/service/upload/pom.xml b/service/upload/pom.xml
index 205848773..3dc22b287 100644
--- a/service/upload/pom.xml
+++ b/service/upload/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/upload/src/main/resources/META-INF/services/upload-examples.xml b/service/upload/src/main/resources/META-INF/services/upload-examples.xml
index 8565541cd..2c6dd0fdb 100644
--- a/service/upload/src/main/resources/META-INF/services/upload-examples.xml
+++ b/service/upload/src/main/resources/META-INF/services/upload-examples.xml
@@ -1,13 +1,13 @@
+ keepFormFieldInMemory="false" />
diff --git a/service/upload/src/main/resources/META-INF/services/upload.xsd b/service/upload/src/main/resources/META-INF/services/upload.xsd
index f03ac0370..e3b9aa412 100644
--- a/service/upload/src/main/resources/META-INF/services/upload.xsd
+++ b/service/upload/src/main/resources/META-INF/services/upload.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -35,7 +35,7 @@
+ default="-1">
+ default="10K">
-
+
-
+
Patch包中包含了对Apache commons-fileupload中部分类的补丁。本补丁遵行Apache License 2.0。
-
+
diff --git a/service/upload/src/test/config/services-skip-validation.xml b/service/upload/src/test/config/services-skip-validation.xml
index d764da8e6..6f466bd23 100644
--- a/service/upload/src/test/config/services-skip-validation.xml
+++ b/service/upload/src/test/config/services-skip-validation.xml
@@ -1,8 +1,8 @@
diff --git a/service/upload/src/test/config/services.xml b/service/upload/src/test/config/services.xml
index 7b86d826c..f25104b65 100644
--- a/service/upload/src/test/config/services.xml
+++ b/service/upload/src/test/config/services.xml
@@ -1,8 +1,8 @@
@@ -10,6 +10,6 @@
+ sizeThreshold="300" keepFormFieldInMemory="true" fileNameKey="filename, fname" />
diff --git a/service/uribroker/pom.xml b/service/uribroker/pom.xml
index 00665be8f..41e7e3545 100644
--- a/service/uribroker/pom.xml
+++ b/service/uribroker/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/uribroker/src/main/resources/META-INF/services/pull/factories/uris-tool.xsd b/service/uribroker/src/main/resources/META-INF/services/pull/factories/uris-tool.xsd
index f1aa956e0..bfbaab79e 100644
--- a/service/uribroker/src/main/resources/META-INF/services/pull/factories/uris-tool.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/pull/factories/uris-tool.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris.xsd b/service/uribroker/src/main/resources/META-INF/services/uris.xsd
index b1213c9e1..3c39a6b7e 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris.xsd
@@ -1,13 +1,13 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,9 +20,9 @@
+ maxOccurs="unbounded" />
+ namespace="http://www.alibaba.com/schema/services/uris" />
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/content-uri.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/content-uri.xsd
index 6e069c2f4..b946718cf 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/content-uri.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/content-uri.xsd
@@ -2,7 +2,7 @@
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/uris/uris-base.xsd" />
@@ -15,7 +15,7 @@
PATH = /prefixPath/contentPath
QUERY_DATA = queryKey1=value1&queryKey2=value2
REFERENCE = reference
-
+
例如:
http://user:pass@myserver.com:8080/view.html?id=1#top
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/interceptors/randomize.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/interceptors/randomize.xsd
index 44a614f83..05fa0a658 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/interceptors/randomize.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/interceptors/randomize.xsd
@@ -1,9 +1,9 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/servlet-content-uri.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/servlet-content-uri.xsd
index 81619f8cf..945763b72 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/servlet-content-uri.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/servlet-content-uri.xsd
@@ -2,7 +2,7 @@
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/uris/uris-base.xsd" />
@@ -15,7 +15,7 @@
PATH = /contextPath/prefixPath/contentPath
QUERY_DATA = queryKey1=value1&queryKey2=value2
REFERENCE = reference
-
+
例如:
http://user:pass@myserver.com:8080/mycontext/view.html?id=1#top
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/servlet-uri.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/servlet-uri.xsd
index 8fe9e4a73..1e0116c06 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/servlet-uri.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/servlet-uri.xsd
@@ -2,7 +2,7 @@
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/uris/uris-base.xsd" />
@@ -16,7 +16,7 @@
PATH_INFO = /pathInfo
QUERY_DATA = queryKey1=value1&queryKey2=value2
REFERENCE = reference
-
+
例如:
http://user:pass@myserver.com:8080/mycontext/myservlet/view?id=1#top
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/turbine-classic-uri.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/turbine-classic-uri.xsd
index b3bd59eb8..a5ffcb78f 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/turbine-classic-uri.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/turbine-classic-uri.xsd
@@ -2,7 +2,7 @@
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/uris/uris-base.xsd" />
@@ -16,7 +16,7 @@
PATH_INFO = /template/templateName/screen/screenName/action/actionName/paramName/paramValue
QUERY_DATA = queryKey1=value1&queryKey2=value2
REFERENCE = reference
-
+
例如:
http://user:pass@myserver.com:8080/mycontext/turbine/template/product,ViewItem?id=1#top
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/uri-bean.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/uri-bean.xsd
index 8e982a5f2..9381175b1 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/uri-bean.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/uri-bean.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/uri.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/uri.xsd
index 745a6a38b..686914099 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/uri.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/uri.xsd
@@ -2,7 +2,7 @@
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/uris/uris-base.xsd" />
@@ -15,7 +15,7 @@
PATH = /path/path
QUERY_DATA = queryKey1=value1&queryKey2=value2
REFERENCE = reference
-
+
例如:
http://user:pass@myserver.com:8080/view?id=1#top
diff --git a/service/uribroker/src/main/resources/META-INF/services/uris/uris-base.xsd b/service/uribroker/src/main/resources/META-INF/services/uris/uris-base.xsd
index f71fcd713..ef6a26d74 100644
--- a/service/uribroker/src/main/resources/META-INF/services/uris/uris-base.xsd
+++ b/service/uribroker/src/main/resources/META-INF/services/uris/uris-base.xsd
@@ -1,18 +1,18 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/uribroker/src/test/config/services-root.xml b/service/uribroker/src/test/config/services-root.xml
index 50f27f3ab..ee602a26f 100644
--- a/service/uribroker/src/test/config/services-root.xml
+++ b/service/uribroker/src/test/config/services-root.xml
@@ -1,9 +1,9 @@
@@ -50,14 +50,14 @@
+ class="com.alibaba.citrus.service.uribroker.interceptor.MyInterceptor" p:path="abc" />
+ class="com.alibaba.citrus.service.uribroker.interceptor.MyPathInterceptor"
+ p:path="abc/def" />
@@ -157,7 +157,7 @@
+ exposed="true" extends="mybeanBase" p:serverScheme="https" />
diff --git a/service/uribroker/src/test/config/services2.xml b/service/uribroker/src/test/config/services2.xml
index 17eecabca..f3d114c99 100644
--- a/service/uribroker/src/test/config/services2.xml
+++ b/service/uribroker/src/test/config/services2.xml
@@ -1,11 +1,11 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/service/velocity/src/main/resources/META-INF/services/template/engines/velocity-engine.xsd b/service/velocity/src/main/resources/META-INF/services/template/engines/velocity-engine.xsd
index 9f12bc21e..24a1884af 100644
--- a/service/velocity/src/main/resources/META-INF/services/template/engines/velocity-engine.xsd
+++ b/service/velocity/src/main/resources/META-INF/services/template/engines/velocity-engine.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -36,7 +36,7 @@
+ minOccurs="0">
+ default="true" />
+ type="springext:integerOrPlaceholder" default="2" />
+ default="true" />
@@ -67,8 +67,8 @@
+ namespace="http://www.alibaba.com/schema/services/template/engines/velocity/plugins"
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/escape-support.xsd b/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/escape-support.xsd
index ed917c94d..d04253754 100644
--- a/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/escape-support.xsd
+++ b/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/escape-support.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/renderable-support.xsd b/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/renderable-support.xsd
index c2ca947ca..4e55d8f3d 100644
--- a/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/renderable-support.xsd
+++ b/service/velocity/src/main/resources/META-INF/services/template/engines/velocity/plugins/renderable-support.xsd
@@ -1,9 +1,9 @@
+ xmlns:beans="http://www.springframework.org/schema/beans" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
diff --git a/service/velocity/src/test/config/services-skip-validation.xml b/service/velocity/src/test/config/services-skip-validation.xml
index bd69da548..5baf7f384 100644
--- a/service/velocity/src/test/config/services-skip-validation.xml
+++ b/service/velocity/src/test/config/services-skip-validation.xml
@@ -1,13 +1,13 @@
+ templateEncoding="ISO-8859-1" />
@@ -82,9 +82,9 @@
+ value="false" />
+ value="org.apache.velocity.util.introspection.UberspectImpl" />
@@ -99,7 +99,7 @@
+ />
@@ -111,7 +111,7 @@
+ class="com.alibaba.citrus.service.velocity.impl.ConditionalEscapeHandler" />
@@ -128,7 +128,7 @@
+ class="com.alibaba.citrus.service.velocity.VelocityEngineTests$MakeEverythingRenderable" />
@@ -140,8 +140,8 @@
+ class="com.alibaba.citrus.service.velocity.AbstractResourceLoaderTests$NoURLFilter"
+ />
diff --git a/service/velocity/src/test/config/services_dev.xml b/service/velocity/src/test/config/services_dev.xml
index a0a500010..2eb94b293 100644
--- a/service/velocity/src/test/config/services_dev.xml
+++ b/service/velocity/src/test/config/services_dev.xml
@@ -1,13 +1,13 @@
+ class="com.alibaba.citrus.service.velocity.AbstractResourceLoaderTests$NoURLFilter"
+ />
diff --git a/service/velocity/src/test/config/services_empty_property.xml b/service/velocity/src/test/config/services_empty_property.xml
index 37ae69209..d28950bbe 100644
--- a/service/velocity/src/test/config/services_empty_property.xml
+++ b/service/velocity/src/test/config/services_empty_property.xml
@@ -1,13 +1,13 @@
+ xmlns="http://www.alibaba.com/schema/services/template/engines/velocity/plugins">
@@ -59,15 +59,15 @@
+ xmlns="http://www.alibaba.com/schema/services/template/engines/velocity/plugins">
+ class="com.alibaba.citrus.service.velocity.support.EscapeTests$Renderable2Handler"
+ />
diff --git a/service/velocity/src/test/config/services_renderable.xml b/service/velocity/src/test/config/services_renderable.xml
index 6f2f68517..153bd9221 100644
--- a/service/velocity/src/test/config/services_renderable.xml
+++ b/service/velocity/src/test/config/services_renderable.xml
@@ -1,13 +1,13 @@
+ class="com.alibaba.citrus.service.velocity.support.RenderableTests$MakeEverythingRenderable" />
diff --git a/test/util/pom.xml b/test/util/pom.xml
index 0e3ba14bb..4e08d6e74 100644
--- a/test/util/pom.xml
+++ b/test/util/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/test/webx/pom.xml b/test/webx/pom.xml
index 0fe919946..0e4008685 100644
--- a/test/webx/pom.xml
+++ b/test/webx/pom.xml
@@ -1,6 +1,6 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/test/webx/src/main/resources/META-INF/services/servlet-test-container.xsd b/test/webx/src/main/resources/META-INF/services/servlet-test-container.xsd
index fd00ade35..80d8e3c76 100644
--- a/test/webx/src/main/resources/META-INF/services/servlet-test-container.xsd
+++ b/test/webx/src/main/resources/META-INF/services/servlet-test-container.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -22,7 +22,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/test/webx/src/main/resources/com/alibaba/citrus/test/context/context-template.xml b/test/webx/src/main/resources/com/alibaba/citrus/test/context/context-template.xml
index 38783b709..33762bd44 100644
--- a/test/webx/src/main/resources/com/alibaba/citrus/test/context/context-template.xml
+++ b/test/webx/src/main/resources/com/alibaba/citrus/test/context/context-template.xml
@@ -1,9 +1,9 @@
diff --git a/test/webx/src/main/resources/com/alibaba/citrus/test/context/test-resources.xml b/test/webx/src/main/resources/com/alibaba/citrus/test/context/test-resources.xml
index 1d9837b16..8c76ee427 100644
--- a/test/webx/src/main/resources/com/alibaba/citrus/test/context/test-resources.xml
+++ b/test/webx/src/main/resources/com/alibaba/citrus/test/context/test-resources.xml
@@ -1,11 +1,11 @@
diff --git a/test/webx/src/test/config/springextWebContextLoaderTests-context.xml b/test/webx/src/test/config/springextWebContextLoaderTests-context.xml
index b54e65f3d..120826272 100644
--- a/test/webx/src/test/config/springextWebContextLoaderTests-context.xml
+++ b/test/webx/src/test/config/springextWebContextLoaderTests-context.xml
@@ -1,10 +1,10 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/accessControl.css b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/accessControl.css
index 48251b1c6..b75c7970e 100644
--- a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/accessControl.css
+++ b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/accessControl.css
@@ -1,7 +1,7 @@
@charset "UTF-8";
.webx-access-denied {
-
+
}
.webx-access-denied pre {
diff --git a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.css b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.css
index 84f680b9c..4b2fdd2ca 100644
--- a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.css
+++ b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.css
@@ -48,26 +48,26 @@
}
.hl-annotation {
- color:grey;
- font-style:italic;
+ color: grey;
+ font-style: italic;
}
.hl-keyword {
- color:#973074;
+ color: #973074;
font-weight: bolder;
}
.hl-variable {
- color:#0000c0;
+ color: #0000c0;
}
.hl-tag-prefix {
- color:#9999cc;
+ color: #9999cc;
font-weight: bolder;
}
.hl-tag {
- color:#000096;
+ color: #000096;
}
.hl-attribute {
diff --git a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.js b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.js
index 6421ebf2d..27427217b 100644
--- a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.js
+++ b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/dom.js
@@ -1,7 +1,7 @@
function expandOrCollapse(imgObj, expand, toggle) {
var imgSrc = imgObj.src;
var collapsed = imgObj.id.gsub(/^handle-/, 'collapsed-');
- var expanded = imgObj.id.gsub(/^handle-/, 'expanded-');
+ var expanded = imgObj.id.gsub(/^handle-/, 'expanded-');
var index = imgSrc.lastIndexOf('/') + 1;
var file = imgSrc.substring(index);
var prefix = imgSrc.substring(0, index);
@@ -18,25 +18,25 @@ function expandOrCollapse(imgObj, expand, toggle) {
}
function registerDomElementHandle() {
- var handleClick = function(event) {
+ var handleClick = function (event) {
expandOrCollapse(event.target, false, true);
};
- $$('img.handle-element').each( function(e) {
+ $$('img.handle-element').each(function (e) {
e.observe('click', handleClick);
});
}
function registerExpandCollapseButtons() {
- var expandAll = function(event) {
- $$('.webx-dom ol>li>.expanded-element').each( function(e) {
+ var expandAll = function (event) {
+ $$('.webx-dom ol>li>.expanded-element').each(function (e) {
var handle = $(e.id.gsub(/^expanded-/, 'handle-'));
expandOrCollapse(handle, true, false);
});
};
- var collapseAll = function(event) {
- $$('.webx-dom ol>li>.expanded-element').each( function(e) {
+ var collapseAll = function (event) {
+ $$('.webx-dom ol>li>.expanded-element').each(function (e) {
var handle = $(e.id.gsub(/^expanded-/, 'handle-'));
expandOrCollapse(handle, false, false);
});
@@ -54,7 +54,7 @@ function registerExpandCollapseButtons() {
}
}
-document.observe("dom:loaded", function() {
+document.observe("dom:loaded", function () {
registerDomElementHandle();
registerExpandCollapseButtons();
});
diff --git a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/tabs.css b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/tabs.css
index 59f3e002a..fcaf70c65 100644
--- a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/tabs.css
+++ b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/component/tabs.css
@@ -1,29 +1,29 @@
@charset "UTF-8";
.webx-tabs ul.nav {
- position:relative;
- float:left;
- width:100%;
- padding:0 0 1.75em 1em;
- margin:0.5em 0 0 0;
- list-style:none;
- line-height:1em;
+ position: relative;
+ float: left;
+ width: 100%;
+ padding: 0 0 1.75em 1em;
+ margin: 0.5em 0 0 0;
+ list-style: none;
+ line-height: 1em;
}
.webx-tabs ul.nav li {
- float:left;
- margin:0 0.2em;
- padding:0;
+ float: left;
+ margin: 0 0.2em;
+ padding: 0;
}
.webx-tabs ul.nav a {
- display:block;
- color:grey;
- text-decoration:none;
- font-weight:bold;
- background:#ddd;
- margin:0;
- padding:0.25em 1em;
+ display: block;
+ color: grey;
+ text-decoration: none;
+ font-weight: bold;
+ background: #ddd;
+ margin: 0;
+ padding: 0.25em 1em;
border-style: solid solid none solid;
border-color: white #aaa white white;
border-width: thin;
@@ -31,29 +31,29 @@
}
.webx-tabs ul.nav a:hover,
-
.webx-tabs ul.nav li.selected a {
- background:#bbb;
- color:#444;
+ background: #bbb;
+ color: #444;
}
.webx-tabs ul.nav li.selected a {
- position:relative;
- z-index:1;
+ position: relative;
+ z-index: 1;
}
+
/* subnav */
.webx-tabs ul.nav ul.subnav {
- position:absolute;
- left:0;
- top:1.5em;
- float:left;
- background:#bbb;
- width:97%;
- margin:0;
- padding:0.25em 0.25em 0.25em 1em;
- list-style:none;
- border-top:thin solid white;
+ position: absolute;
+ left: 0;
+ top: 1.5em;
+ float: left;
+ background: #bbb;
+ width: 97%;
+ margin: 0;
+ padding: 0.25em 0.25em 0.25em 1em;
+ list-style: none;
+ border-top: thin solid white;
border-radius: 5px 5px 0 0;
display: none;
}
@@ -63,23 +63,22 @@
}
.webx-tabs ul.nav ul.subnav li {
- float:left;
- display:block;
- margin:1px 0 0 0;
+ float: left;
+ display: block;
+ margin: 1px 0 0 0;
}
.webx-tabs ul.nav ul.subnav a {
- background:#bbb;
- color:grey;
- display:inline;
- margin:0;
- padding:0 1em;
- border:0;
+ background: #bbb;
+ color: grey;
+ display: inline;
+ margin: 0;
+ padding: 0 1em;
+ border: 0;
}
.webx-tabs ul.nav ul.subnav a:hover,
-
.webx-tabs ul.nav ul.subnav li.selected a {
- color:#444;
+ color: #444;
background: #bbb url(images/arrow_tab.gif) no-repeat left center;
}
diff --git a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.css b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.css
index 008253756..4a62b9408 100644
--- a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.css
+++ b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.css
@@ -4,7 +4,7 @@
* Resolvable Deps.
*/
#webx-resolvable-deps {
- font-family: Consolas,"Courier New",Courier,monospace;
+ font-family: Consolas, "Courier New", Courier, monospace;
}
#webx-resolvable-deps ol {
@@ -30,7 +30,7 @@
* Configurations.
*/
#webx-configurations .configuration-file-name {
- font-family: Consolas,"Courier New",Courier,monospace;
+ font-family: Consolas, "Courier New", Courier, monospace;
}
/**
@@ -76,19 +76,19 @@
* Pull Tools.
*/
#webx-pull-tools .webx-pull-tool {
- color:#000096;
+ color: #000096;
font-weight: bolder;
}
#webx-pull-tools .webx-pull-tool-set {
- color:grey;
+ color: grey;
font-style: italic;
font-weight: bolder;
}
#webx-pull-tools li pre {
border: 1px solid grey;
- margin: 0 0 0.5em 0 ;
+ margin: 0 0 0.5em 0;
padding: 0.5em;
}
@@ -116,7 +116,7 @@
* Common.
*/
.hl-tag {
- color:#000096;
+ color: #000096;
}
.hl-attribute {
diff --git a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.js b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.js
index f530afd9c..2f0419ec4 100644
--- a/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.js
+++ b/webx/dev/src/main/resources/com/alibaba/citrus/dev/handler/impl/explorer.js
@@ -10,10 +10,10 @@ function setQuery(resourceName, submit) {
}
function registerResolvableDepValueHandle() {
- var handleClick = function(event) {
+ var handleClick = function (event) {
var imgObj = $(event.target.id);
var imgSrc = imgObj.src;
- var content = event.target.id.gsub(/^handle-/, 'resolvable-deps-value-');
+ var content = event.target.id.gsub(/^handle-/, 'resolvable-deps-value-');
var index = imgSrc.lastIndexOf('/') + 1;
var file = imgSrc.substring(index);
var prefix = imgSrc.substring(0, index);
@@ -27,16 +27,16 @@ function registerResolvableDepValueHandle() {
}
};
- $$('img.webx-resolvable-deps-value-handle').each( function(e) {
+ $$('img.webx-resolvable-deps-value-handle').each(function (e) {
e.observe('click', handleClick);
});
}
function registerConfigurationFileContentHandle() {
- var handleClick = function(event) {
+ var handleClick = function (event) {
var imgObj = $(event.target.id + '-img');
var imgSrc = imgObj.src;
- var content = event.target.id.gsub(/^handle-/, 'configuration-file-content-');
+ var content = event.target.id.gsub(/^handle-/, 'configuration-file-content-');
var index = imgSrc.lastIndexOf('/') + 1;
var file = imgSrc.substring(index);
var prefix = imgSrc.substring(0, index);
@@ -50,16 +50,16 @@ function registerConfigurationFileContentHandle() {
}
};
- $$('a.handle-configuration-file-content').each( function(e) {
+ $$('a.handle-configuration-file-content').each(function (e) {
e.observe('click', handleClick);
});
}
function registerPullToolValueHandle() {
- var handleClick = function(event) {
+ var handleClick = function (event) {
var imgObj = $(event.target.id + '-img');
var imgSrc = imgObj.src;
- var content = event.target.id.gsub(/^handle-/, 'pull-tool-value-');
+ var content = event.target.id.gsub(/^handle-/, 'pull-tool-value-');
var index = imgSrc.lastIndexOf('/') + 1;
var file = imgSrc.substring(index);
var prefix = imgSrc.substring(0, index);
@@ -73,25 +73,25 @@ function registerPullToolValueHandle() {
}
};
- $$('a.webx-pull-tool').each( function(e) {
+ $$('a.webx-pull-tool').each(function (e) {
e.observe('click', handleClick);
});
}
-document.observe("dom:loaded", function() {
- $$('.webx-resolvable-deps-value').each( function(e) {
+document.observe("dom:loaded", function () {
+ $$('.webx-resolvable-deps-value').each(function (e) {
e.hide();
});
registerResolvableDepValueHandle();
- $$('.configuration-file-content').each( function(e) {
+ $$('.configuration-file-content').each(function (e) {
e.hide();
});
registerConfigurationFileContentHandle();
- $$('.pull-tool-value').each( function(e) {
+ $$('.pull-tool-value').each(function (e) {
e.hide();
});
diff --git a/webx/framework/pom.xml b/webx/framework/pom.xml
index d0b6219ca..c0f362e56 100644
--- a/webx/framework/pom.xml
+++ b/webx/framework/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/webx/framework/src/main/resources/META-INF/services/webx-configuration.xsd b/webx/framework/src/main/resources/META-INF/services/webx-configuration.xsd
index aa48f29f2..ba5747b71 100644
--- a/webx/framework/src/main/resources/META-INF/services/webx-configuration.xsd
+++ b/webx/framework/src/main/resources/META-INF/services/webx-configuration.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0">
+ minOccurs="0">
+ minOccurs="0">
+ type="WebxComponentType" />
+ />
+ default="/WEB-INF/webx-*.xml" />
diff --git a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/exception.js b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/exception.js
index 53f8c2775..93243ed5d 100644
--- a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/exception.js
+++ b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/exception.js
@@ -1,36 +1,36 @@
function registerExceptionHandle() {
$$('div.webx-exception-type>img').each(
- function(e) {
- e.observe('click', function(event) {
- var imgObj = Event.element(event);
- var imgSrc = imgObj.src;
- var details = imgObj.id.gsub(/^webx-exception-handle-/,
- 'webx-exception-');
- var index = imgSrc.lastIndexOf('/') + 1;
- var file = imgSrc.substring(index);
- var prefix = imgSrc.substring(0, index);
+ function (e) {
+ e.observe('click', function (event) {
+ var imgObj = Event.element(event);
+ var imgSrc = imgObj.src;
+ var details = imgObj.id.gsub(/^webx-exception-handle-/,
+ 'webx-exception-');
+ var index = imgSrc.lastIndexOf('/') + 1;
+ var file = imgSrc.substring(index);
+ var prefix = imgSrc.substring(0, index);
- if (file == 'open.gif') {
- $(details).hide();
- Effect.SlideUp(details);
- imgObj.src = prefix + 'close.gif';
- } else {
- Effect.SlideDown(details);
- imgObj.src = prefix + 'open.gif';
- }
- });
-
- var details = e.id.gsub(/^webx-exception-handle-/,
- 'webx-exception-');
-
- if (e.src.endsWith('close.gif')) {
+ if (file == 'open.gif') {
$(details).hide();
+ Effect.SlideUp(details);
+ imgObj.src = prefix + 'close.gif';
} else {
- $(details).show();
+ Effect.SlideDown(details);
+ imgObj.src = prefix + 'open.gif';
}
});
+
+ var details = e.id.gsub(/^webx-exception-handle-/,
+ 'webx-exception-');
+
+ if (e.src.endsWith('close.gif')) {
+ $(details).hide();
+ } else {
+ $(details).show();
+ }
+ });
}
-document.observe("dom:loaded", function() {
+document.observe("dom:loaded", function () {
registerExceptionHandle();
});
diff --git a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.css b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.css
index 73934727e..e91262673 100644
--- a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.css
+++ b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.css
@@ -19,22 +19,22 @@ td.item-key {
}
td.item-key .item-count {
- color:grey;
- font-size:smaller;
+ color: grey;
+ font-size: smaller;
}
td.item-value ul {
- margin:0;
- padding:0;
- list-style:none;
+ margin: 0;
+ padding: 0;
+ list-style: none;
}
td.item-value .item-entry-key {
- color:dark;
- font-size:smaller;
- font-weight:bold;
+ color: dark;
+ font-size: smaller;
+ font-weight: bold;
}
td.item-value .item-entry-value {
- display:inline;
+ display: inline;
}
diff --git a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.js b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.js
index 5374a39b5..3713d99e7 100644
--- a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.js
+++ b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/keyValues.js
@@ -1,24 +1,24 @@
function registerOddEvenRows() {
- $$('tr:nth-child(odd)').each( function(e) {
- e.observe('mouseover', function(event) {
+ $$('tr:nth-child(odd)').each(function (e) {
+ e.observe('mouseover', function (event) {
event.findElement('tr').className = 'row-highlight';
});
- e.observe('mouseout', function(event) {
+ e.observe('mouseout', function (event) {
event.findElement('tr').className = 'row-odd';
});
e.className = 'row-odd';
});
- $$('tr:nth-child(even)').each( function(e) {
- e.observe('mouseover', function(event) {
+ $$('tr:nth-child(even)').each(function (e) {
+ e.observe('mouseover', function (event) {
event.findElement('tr').className = 'row-highlight';
});
- e.observe('mouseout', function(event) {
+ e.observe('mouseout', function (event) {
event.findElement('tr').className = 'row-even';
});
e.className = 'row-even';
});
}
-document.observe("dom:loaded", function() {
+document.observe("dom:loaded", function () {
registerOddEvenRows();
});
diff --git a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/menu.css b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/menu.css
index 15a708cae..6b0a379ea 100644
--- a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/menu.css
+++ b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/component/menu.css
@@ -2,82 +2,85 @@
/* 一级以上菜单 */
.webx-menu ul {
- margin:0 0 5px 0;
- padding:0;
+ margin: 0 0 5px 0;
+ padding: 0;
background: #ffffff;
- border:solid 1px #AAAAAA;
- width:100%;
- list-style:none;
- float:left;
-/* 防止menu之下的内容侵占menu所在行 */
- clear:both;
+ border: solid 1px #AAAAAA;
+ width: 100%;
+ list-style: none;
+ float: left;
+ /* 防止menu之下的内容侵占menu所在行 */
+ clear: both;
}
.webx-menu li {
- position:relative;
- list-style:none;
- padding:0 20px 0 10px;
- float:left;
- white-space:nowrap;
- z-index:101;
+ position: relative;
+ list-style: none;
+ padding: 0 20px 0 10px;
+ float: left;
+ white-space: nowrap;
+ z-index: 101;
}
.webx-menu li:hover {
- background:#4792E6;
- border-color:#665500;
- color:white;
+ background: #4792E6;
+ border-color: #665500;
+ color: white;
}
.webx-menu li.webx-subMenu {
- background:#ffffff url(images/arrow_v.gif) no-repeat right center;
+ background: #ffffff url(images/arrow_v.gif) no-repeat right center;
}
.webx-menu li.webx-subMenu:hover {
- background:#4792E6 url(images/arrow_v_active.gif) no-repeat right center;
+ background: #4792E6 url(images/arrow_v_active.gif) no-repeat right center;
}
.webx-menu a:link, .webx-menu a:visited, .webx-menu a:hover, .webx-menu a:active {
- font-weight:normal;
- color:inherit;
- border:none;
+ font-weight: normal;
+ color: inherit;
+ border: none;
}
.webx-menu img {
-/* 使图片不会使li上下不齐 */
- float:left;
- padding:0 5px 0 0;
+ /* 使图片不会使li上下不齐 */
+ float: left;
+ padding: 0 5px 0 0;
}
+
/* 二级以上菜单 */
.webx-menu ul ul {
- display:none;
+ display: none;
position: absolute;
- left:-1px;
- top:98%;
- width:auto;
+ left: -1px;
+ top: 98%;
+ width: auto;
}
.webx-menu ul ul li {
- float:none;
- color:black;
+ float: none;
+ color: black;
}
.webx-menu ul ul li.webx-subMenu {
- background:#ffffff url(images/arrow_h.gif) no-repeat right center;
+ background: #ffffff url(images/arrow_h.gif) no-repeat right center;
}
.webx-menu ul ul li.webx-subMenu:hover {
- background:#4792E6 url(images/arrow_h_active.gif) no-repeat right center;
+ background: #4792E6 url(images/arrow_h_active.gif) no-repeat right center;
}
+
/* 自动弹出二级以上菜单 */
.webx-menu li:hover>ul {
- display:block
+ display: block
}
+
/* 三级以上菜单 */
.webx-menu ul ul ul {
position: absolute;
- left:98%;
- top:-2px;
+ left: 98%;
+ top: -2px;
}
diff --git a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/support/styles.css b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/support/styles.css
index 6c5252c9d..441d5bcf3 100644
--- a/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/support/styles.css
+++ b/webx/framework/src/main/resources/com/alibaba/citrus/webx/handler/support/styles.css
@@ -35,20 +35,20 @@ a {
text-decoration: none;
}
-a:link,a:visited {
+a:link, a:visited {
}
-a:hover,a:active {
+a:hover, a:active {
font-weight: bold
}
h1 {
- margin:0.8em 0 0.7em 0;
- padding:0;
- color:#4792E6;
+ margin: 0.8em 0 0.7em 0;
+ padding: 0;
+ color: #4792E6;
}
#webx-body {
margin: 0;
- padding:0 1em;
+ padding: 0 1em;
}
diff --git a/webx/framework/src/test/config/WEB-INF/web.xml b/webx/framework/src/test/config/WEB-INF/web.xml
index 93595a5a3..17e3b8b44 100644
--- a/webx/framework/src/test/config/WEB-INF/web.xml
+++ b/webx/framework/src/test/config/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/webx/framework/src/test/config/WEB-INF/webx-app1.xml b/webx/framework/src/test/config/WEB-INF/webx-app1.xml
index f035a5870..a21632832 100644
--- a/webx/framework/src/test/config/WEB-INF/webx-app1.xml
+++ b/webx/framework/src/test/config/WEB-INF/webx-app1.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$ComponentsAware" />
diff --git a/webx/framework/src/test/config/WEB-INF/webx-app2.xml b/webx/framework/src/test/config/WEB-INF/webx-app2.xml
index eae6e6777..7abfd512d 100644
--- a/webx/framework/src/test/config/WEB-INF/webx-app2.xml
+++ b/webx/framework/src/test/config/WEB-INF/webx-app2.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$ComponentsAware" />
diff --git a/webx/framework/src/test/config/WEB-INF/webx-app3.xml b/webx/framework/src/test/config/WEB-INF/webx-app3.xml
index eae6e6777..7abfd512d 100644
--- a/webx/framework/src/test/config/WEB-INF/webx-app3.xml
+++ b/webx/framework/src/test/config/WEB-INF/webx-app3.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$ComponentsAware" />
diff --git a/webx/framework/src/test/config/WEB-INF/webx-app4.xml b/webx/framework/src/test/config/WEB-INF/webx-app4.xml
index f035a5870..a21632832 100644
--- a/webx/framework/src/test/config/WEB-INF/webx-app4.xml
+++ b/webx/framework/src/test/config/WEB-INF/webx-app4.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$ComponentsAware" />
diff --git a/webx/framework/src/test/config/WEB-INF/webx-app5.xml b/webx/framework/src/test/config/WEB-INF/webx-app5.xml
index f035a5870..a21632832 100644
--- a/webx/framework/src/test/config/WEB-INF/webx-app5.xml
+++ b/webx/framework/src/test/config/WEB-INF/webx-app5.xml
@@ -1,11 +1,11 @@
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$ComponentsAware" />
diff --git a/webx/framework/src/test/config/WEB-INF/webx.xml b/webx/framework/src/test/config/WEB-INF/webx.xml
index ef7f3ee0d..753a61697 100644
--- a/webx/framework/src/test/config/WEB-INF/webx.xml
+++ b/webx/framework/src/test/config/WEB-INF/webx.xml
@@ -1,12 +1,12 @@
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$MyController" />
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$MyController" />
@@ -39,10 +39,10 @@
+ class="com.alibaba.citrus.webx.servlet.WebxFrameworkFilterTests$ComponentsAware" />
+ xmlns="http://www.alibaba.com/schema/services/pipeline/valves">
diff --git a/webx/framework/src/test/config/app2/WEB-INF/web.xml b/webx/framework/src/test/config/app2/WEB-INF/web.xml
index fca7ce4d8..0a7117ea7 100644
--- a/webx/framework/src/test/config/app2/WEB-INF/web.xml
+++ b/webx/framework/src/test/config/app2/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/webx/framework/src/test/config/app2/WEB-INF/webx.xml b/webx/framework/src/test/config/app2/WEB-INF/webx.xml
index 94cf06669..e124e1ec1 100644
--- a/webx/framework/src/test/config/app2/WEB-INF/webx.xml
+++ b/webx/framework/src/test/config/app2/WEB-INF/webx.xml
@@ -1,11 +1,11 @@
diff --git a/webx/framework/src/test/config/app3/WEB-INF/webx.xml b/webx/framework/src/test/config/app3/WEB-INF/webx.xml
index 364630367..3a9a8adc7 100644
--- a/webx/framework/src/test/config/app3/WEB-INF/webx.xml
+++ b/webx/framework/src/test/config/app3/WEB-INF/webx.xml
@@ -1,9 +1,9 @@
diff --git a/webx/framework/src/test/config/app4/WEB-INF/web.xml b/webx/framework/src/test/config/app4/WEB-INF/web.xml
index cb4b2c49f..9ff40f164 100644
--- a/webx/framework/src/test/config/app4/WEB-INF/web.xml
+++ b/webx/framework/src/test/config/app4/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/webx/framework/src/test/config/app4/WEB-INF/webx.xml b/webx/framework/src/test/config/app4/WEB-INF/webx.xml
index 31dce23f1..74d5dc17b 100644
--- a/webx/framework/src/test/config/app4/WEB-INF/webx.xml
+++ b/webx/framework/src/test/config/app4/WEB-INF/webx.xml
@@ -1,9 +1,9 @@
diff --git a/webx/framework/src/test/config/webx-configuration-skip-validation.xml b/webx/framework/src/test/config/webx-configuration-skip-validation.xml
index 63e2265ce..1d320cc39 100644
--- a/webx/framework/src/test/config/webx-configuration-skip-validation.xml
+++ b/webx/framework/src/test/config/webx-configuration-skip-validation.xml
@@ -1,12 +1,12 @@
+ componentConfigurationLocationPattern="test-*.xml" defaultComponent="main"
+ defaultControllerClass="com.alibaba.citrus.webx.config.WebxConfigurationTests$MyController">
+ class="com.alibaba.citrus.webx.config.WebxConfigurationTests$MyController"
+ p:name="test" />
+ class="com.alibaba.citrus.webx.config.WebxConfigurationTests$MyController"
+ p:name="test1" />
+ class="com.alibaba.citrus.webx.config.WebxConfigurationTests$MyRootController"
+ p:name="test1" />
diff --git a/webx/framework/src/test/resources/META-INF/mycomponent/a.xml b/webx/framework/src/test/resources/META-INF/mycomponent/a.xml
index cfd58c58d..3f7271a9b 100644
--- a/webx/framework/src/test/resources/META-INF/mycomponent/a.xml
+++ b/webx/framework/src/test/resources/META-INF/mycomponent/a.xml
@@ -1,9 +1,9 @@
diff --git a/webx/framework/src/test/resources/META-INF/mycomponent/b.xml b/webx/framework/src/test/resources/META-INF/mycomponent/b.xml
index 03fdca3f0..5749cff0d 100644
--- a/webx/framework/src/test/resources/META-INF/mycomponent/b.xml
+++ b/webx/framework/src/test/resources/META-INF/mycomponent/b.xml
@@ -1,9 +1,9 @@
diff --git a/webx/turbine/pom.xml b/webx/turbine/pom.xml
index 6456731f3..bba122b49 100644
--- a/webx/turbine/pom.xml
+++ b/webx/turbine/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
citrus-parent
com.alibaba.citrus
diff --git a/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/form-resolver.xsd b/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/form-resolver.xsd
index b8038a42e..d1d74d495 100644
--- a/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/form-resolver.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/form-resolver.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/parameter-resolver.xsd b/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/parameter-resolver.xsd
index 5d4aba72d..179d72358 100644
--- a/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/parameter-resolver.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/parameter-resolver.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/turbine-rundata-resolver.xsd b/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/turbine-rundata-resolver.xsd
index a1aea7fc7..6f2857d45 100644
--- a/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/turbine-rundata-resolver.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/data-resolver/factories/turbine-rundata-resolver.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/form/validators/csrf-validator.xsd b/webx/turbine/src/main/resources/META-INF/services/form/validators/csrf-validator.xsd
index 97c831d3d..65e4c2fd4 100644
--- a/webx/turbine/src/main/resources/META-INF/services/form/validators/csrf-validator.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/form/validators/csrf-validator.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/page-authorization.xsd b/webx/turbine/src/main/resources/META-INF/services/page-authorization.xsd
index c2fe0581d..933bea751 100644
--- a/webx/turbine/src/main/resources/META-INF/services/page-authorization.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/page-authorization.xsd
@@ -1,12 +1,12 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -19,7 +19,7 @@
+ type="PageAuthorizationMatchType" />
@@ -35,7 +35,7 @@
+ type="PageAuthorizationGrantType" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/path-condition.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/path-condition.xsd
index c46673844..dcd31c9e1 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/path-condition.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/path-condition.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-condition.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-condition.xsd
index aae66e8f8..19c7356fc 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-condition.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-condition.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-extension-condition.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-extension-condition.xsd
index c9f234600..1be553070 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-extension-condition.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/conditions/target-extension-condition.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/analyzeURL.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/analyzeURL.xsd
index 08cc87f6d..de102cba0 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/analyzeURL.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/analyzeURL.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/breakUnlessTargetRedirected.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/breakUnlessTargetRedirected.xsd
index 3c673087f..930f9799c 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/breakUnlessTargetRedirected.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/breakUnlessTargetRedirected.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/checkCsrfToken.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/checkCsrfToken.xsd
index 83075a218..739198ce8 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/checkCsrfToken.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/checkCsrfToken.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/exportControl.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/exportControl.xsd
index ebcc33c47..2b70fd12d 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/exportControl.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/exportControl.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/getResource.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/getResource.xsd
index db5bf1b54..8142148a3 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/getResource.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/getResource.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/handleException.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/handleException.xsd
index 6030442d4..e654f6b27 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/handleException.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/handleException.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
@@ -20,7 +20,7 @@
+ minOccurs="0" maxOccurs="unbounded" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/pageAuthorization.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/pageAuthorization.xsd
index 124c803ef..7e3ef6d40 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/pageAuthorization.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/pageAuthorization.xsd
@@ -1,12 +1,12 @@
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performAction.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performAction.xsd
index 52e75bd89..2193ff570 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performAction.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performAction.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performScreen.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performScreen.xsd
index cad36699b..0d76b5031 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performScreen.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performScreen.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performTemplateScreen.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performTemplateScreen.xsd
index d839b24f2..7563a6f49 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performTemplateScreen.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/performTemplateScreen.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/prepareForTurbine.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/prepareForTurbine.xsd
index b66c3f528..57d9184d5 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/prepareForTurbine.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/prepareForTurbine.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/renderTemplate.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/renderTemplate.xsd
index a5d1c12e7..38330adf8 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/renderTemplate.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/renderTemplate.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/requestHandler.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/requestHandler.xsd
index 90bd6d2f4..5a57a5c90 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/requestHandler.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/requestHandler.xsd
@@ -1,19 +1,19 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/setLoggingContext.xsd b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/setLoggingContext.xsd
index 0fd14479d..adf580486 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/setLoggingContext.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pipeline/valves/setLoggingContext.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pull/factories/control-tool.xsd b/webx/turbine/src/main/resources/META-INF/services/pull/factories/control-tool.xsd
index a23f04d81..dbffdfec0 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pull/factories/control-tool.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pull/factories/control-tool.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pull/factories/csrfToken.xsd b/webx/turbine/src/main/resources/META-INF/services/pull/factories/csrfToken.xsd
index 3717dc33b..aa7bbeb0a 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pull/factories/csrfToken.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pull/factories/csrfToken.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pull/factories/page-tool.xsd b/webx/turbine/src/main/resources/META-INF/services/pull/factories/page-tool.xsd
index c78fb2308..81fc46e45 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pull/factories/page-tool.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pull/factories/page-tool.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/pull/factories/rundata-tool.xsd b/webx/turbine/src/main/resources/META-INF/services/pull/factories/rundata-tool.xsd
index 290071160..d05be56c0 100644
--- a/webx/turbine/src/main/resources/META-INF/services/pull/factories/rundata-tool.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/pull/factories/rundata-tool.xsd
@@ -1,13 +1,13 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
diff --git a/webx/turbine/src/main/resources/META-INF/services/uris/turbine-content-uri.xsd b/webx/turbine/src/main/resources/META-INF/services/uris/turbine-content-uri.xsd
index 096f0b877..37afe57ec 100644
--- a/webx/turbine/src/main/resources/META-INF/services/uris/turbine-content-uri.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/uris/turbine-content-uri.xsd
@@ -1,16 +1,16 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/uris/uris-base.xsd" />
@@ -25,7 +25,7 @@
PATH_INFO = /componentPath/prefixPath/contentPath
QUERY_DATA = queryKey1=value1&queryKey2=value2
REFERENCE = reference
-
+
例如:
http://user:pass@myserver.com:8080/mycontext/myservlet/mycomponent/myContent.jpg
diff --git a/webx/turbine/src/main/resources/META-INF/services/uris/turbine-uri.xsd b/webx/turbine/src/main/resources/META-INF/services/uris/turbine-uri.xsd
index 8fd1c6d17..207ced6a5 100644
--- a/webx/turbine/src/main/resources/META-INF/services/uris/turbine-uri.xsd
+++ b/webx/turbine/src/main/resources/META-INF/services/uris/turbine-uri.xsd
@@ -1,16 +1,16 @@
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:springext="http://www.alibaba.com/schema/springext/base" elementFormDefault="qualified">
+ schemaLocation="http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/springext/springext-base.xsd" />
+ schemaLocation="http://localhost:8080/schema/www.alibaba.com/schema/services/uris/uris-base.xsd" />
@@ -23,7 +23,7 @@
PATH_INFO = /contextPath/servletPath/target/path/path
QUERY_DATA = action=actionName&queryKey1=value1&queryKey2=value2
REFERENCE = reference
-
+
例如:
http://user:pass@myserver.com:8080/mycontext/myservlet/myTarget.vm?action=myAction
diff --git a/webx/turbine/src/test/config/WEB-INF/web.xml b/webx/turbine/src/test/config/WEB-INF/web.xml
index 460a3fcd9..752635b98 100644
--- a/webx/turbine/src/test/config/WEB-INF/web.xml
+++ b/webx/turbine/src/test/config/WEB-INF/web.xml
@@ -1,7 +1,7 @@
diff --git a/webx/turbine/src/test/config/WEB-INF/webx-app1.xml b/webx/turbine/src/test/config/WEB-INF/webx-app1.xml
index 8e2f16761..30d4d7305 100644
--- a/webx/turbine/src/test/config/WEB-INF/webx-app1.xml
+++ b/webx/turbine/src/test/config/WEB-INF/webx-app1.xml
@@ -1,26 +1,26 @@
+ logName="mySecurity" />
+ logName="mySecurity" />
+ class="com.alibaba.citrus.turbine.pipeline.valve.CheckCsrfTokenValveTests$CheckCsrfManually"
+ />
@@ -84,14 +84,14 @@
+ class="com.alibaba.citrus.turbine.pipeline.valve.PrepareForTurbineValveTests$MyErrorValve"
+ />
+ class="com.alibaba.citrus.turbine.pipeline.valve.PrepareForTurbineValveTests$MyValve" />
@@ -109,31 +109,31 @@
+ statusCode="501" />
+ statusCode="502" />
+ statusCode="503" />
+ page="error_illegal_argument_exception.vm" />
+ callbackClass="com.alibaba.citrus.turbine.pipeline.valve.PageAuthorizationValveTests$MyCallback" />
+ class="com.alibaba.citrus.turbine.pipeline.valve.PageAuthorizationValveTests$MyValve" />
+ classes="com.alibaba.test.app1.module.*.**" />
@@ -167,13 +167,13 @@
+ defaultName="MyDefaultModule" />
+ defaultName="MyDefaultModule" />
+ defaultName="MyDefaultModule" />
diff --git a/webx/turbine/src/test/config/WEB-INF/webx-app2.xml b/webx/turbine/src/test/config/WEB-INF/webx-app2.xml
index fbc373f5a..bff6fc3d0 100644
--- a/webx/turbine/src/test/config/WEB-INF/webx-app2.xml
+++ b/webx/turbine/src/test/config/WEB-INF/webx-app2.xml
@@ -1,25 +1,25 @@
+ class="com.alibaba.citrus.turbine.dataresolver.ParameterResolverTests$MyRegistrar"
+ />
diff --git a/webx/turbine/src/test/config/page-auth.xml b/webx/turbine/src/test/config/page-auth.xml
index 4c65d3df4..1695976dd 100644
--- a/webx/turbine/src/test/config/page-auth.xml
+++ b/webx/turbine/src/test/config/page-auth.xml
@@ -1,9 +1,9 @@
@@ -48,6 +48,6 @@
+ default="allow" />
diff --git a/webx/turbine/src/test/config/services-uris-no-mappings.xml b/webx/turbine/src/test/config/services-uris-no-mappings.xml
index b8589819a..dca3f1190 100644
--- a/webx/turbine/src/test/config/services-uris-no-mappings.xml
+++ b/webx/turbine/src/test/config/services-uris-no-mappings.xml
@@ -1,10 +1,10 @@
+ convertTargetCase="false" targetMappingRule="mymapper" />
diff --git a/webx/turbine/src/test/config/services-uris.xml b/webx/turbine/src/test/config/services-uris.xml
index 50cf5cb46..7a60646ed 100644
--- a/webx/turbine/src/test/config/services-uris.xml
+++ b/webx/turbine/src/test/config/services-uris.xml
@@ -1,11 +1,11 @@
+ convertTargetCase="false" targetMappingRule="mymapper" mappingRuleServiceRef="mapping2" />
mycontext
@@ -54,7 +54,7 @@
+ xmlns="http://www.alibaba.com/schema/services/mapping-rules">