修改配置文件格式到webx 3.2.0风格，并格式化

Author: Michael Zhou

petstore/biz/src/main/resources/petstore/biz/manager.xml

@@ -4,9 +4,9 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:p="http://www.springframework.org/schema/p"
        xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/context http://localhost:8080/schema/www.springframework.org/schema/context/spring-context.xsd
-    "
+           http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/context http://localhost:8080/schema/www.springframework.org/schema/context/spring-context.xsd
+       "
        default-autowire="byName">
 
     <context:component-scan base-package="com.alibaba.sample.petstore.biz.impl">

petstore/biz/src/test/config/resources.xml

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:p="http://www.springframework.org/schema/p"
              xmlns:services="http://www.alibaba.com/schema/services"
              xmlns:res-loaders="http://www.alibaba.com/schema/services/resource-loading/loaders"
-             xmlns:beans="http://www.springframework.org/schema/beans"
-             xmlns:p="http://www.springframework.org/schema/p"
              xsi:schemaLocation="
-                http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
-                http://www.alibaba.com/schema/services/resource-loading/loaders http://localhost:8080/schema/services-resource-loading-loaders.xsd
-                http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+                 http://www.alibaba.com/schema/services/resource-loading/loaders http://localhost:8080/schema/services-resource-loading-loaders.xsd
+                 http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
              ">
 
-    <services:resource-loading xmlns="http://www.alibaba.com/schema/services">
+    <services:resource-loading>
 
         <resource-alias pattern="/petstore/dal" name="/classpath/petstore/dal" />
 
         <resource-alias pattern="/petstore/upload" name="/destdir/upload" />
 
     </services:resource-loading>
 
-</beans:beans>
+</beans:beans>

petstore/dal/src/main/resources/petstore/dal/dao.xml

@@ -4,9 +4,9 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:p="http://www.springframework.org/schema/p"
        xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context http://localhost:8080/schema/www.springframework.org/schema/context/spring-context.xsd
-    "
+           http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/context http://localhost:8080/schema/www.springframework.org/schema/context/spring-context.xsd
+       "
        default-autowire="byName">
 
     <context:component-scan base-package="com.alibaba.sample.petstore.dal.dao.ibatis">

petstore/dal/src/main/resources/petstore/dal/data-source.xml

@@ -4,9 +4,9 @@
        xmlns:jdbc="http://www.springframework.org/schema/jdbc"
        xmlns:p="http://www.springframework.org/schema/p"
        xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/jdbc http://localhost:8080/schema/www.springframework.org/schema/jdbc/spring-jdbc.xsd
-    ">
+           http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/jdbc http://localhost:8080/schema/www.springframework.org/schema/jdbc/spring-jdbc.xsd
+       ">
 
     <!-- ======================================================================== -->
     <!--  Hsqldb (Server mode)                                                    -->

petstore/dal/src/test/config/resources.xml

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xmlns:services="http://www.alibaba.com/schema/services"
-             xmlns:beans="http://www.springframework.org/schema/beans"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:p="http://www.springframework.org/schema/p"
+             xmlns:services="http://www.alibaba.com/schema/services"
              xsi:schemaLocation="
-                http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
-                http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+                 http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
              ">
 
-    <services:resource-loading xmlns="http://www.alibaba.com/schema/services">
+    <services:resource-loading>
 
         <resource-alias pattern="/petstore/dal" name="/classpath/petstore/dal" />
 
     </services:resource-loading>
 
-</beans:beans>
+</beans:beans>

petstore/web/src/main/webapp/WEB-INF/common/pipeline-exception.xml

@@ -1,37 +1,38 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xmlns:services="http://www.alibaba.com/schema/services"
-             xmlns:pl-conditions="http://www.alibaba.com/schema/services/pipeline/conditions"
-             xmlns:pl-valves="http://www.alibaba.com/schema/services/pipeline/valves"
-             xmlns:beans="http://www.springframework.org/schema/beans"
-             xmlns:p="http://www.springframework.org/schema/p"
-             xsi:schemaLocation="
-                http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
-                http://www.alibaba.com/schema/services/pipeline/conditions http://localhost:8080/schema/services-pipeline-conditions.xsd
-                http://www.alibaba.com/schema/services/pipeline/valves http://localhost:8080/schema/services-pipeline-valves.xsd
-                http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
-             ">
-
-    <services:pipeline id="exceptionPipeline"
-                       xmlns="http://www.alibaba.com/schema/services/pipeline/valves">
-
-        <!-- 初始化turbine rundata，并在pipelineContext中设置可能会用到的对象(如rundata、utils)，以便valve取得。 -->
-        <prepareForTurbine />
-
-        <!-- 根据异常，选择适当的错误页面及statusCode。 -->
-        <handleException defaultPage="error">
-
-            <on-exception type="com.alibaba.citrus.service.template.TemplateNotFoundException"
-                          statusCode="404" logging="brief" />
-
-            <on-exception type="com.alibaba.citrus.service.moduleloader.ModuleNotFoundException"
-                          statusCode="404" logging="brief" />
-
-        </handleException>
-
-        <performTemplateScreen />
-        <renderTemplate />
-
-    </services:pipeline>
-
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:p="http://www.springframework.org/schema/p"
+             xmlns:services="http://www.alibaba.com/schema/services"
+             xmlns:pl-conditions="http://www.alibaba.com/schema/services/pipeline/conditions"
+             xmlns:pl-valves="http://www.alibaba.com/schema/services/pipeline/valves"
+             xsi:schemaLocation="
+                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+                 http://www.alibaba.com/schema/services/pipeline/conditions http://localhost:8080/schema/services-pipeline-conditions.xsd
+                 http://www.alibaba.com/schema/services/pipeline/valves http://localhost:8080/schema/services-pipeline-valves.xsd
+                 http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+             ">
+
+    <services:pipeline id="exceptionPipeline">
+
+        <!-- 初始化turbine rundata，并在pipelineContext中设置可能会用到的对象(如rundata、utils)，以便valve取得。 -->
+        <pl-valves:prepareForTurbine />
+
+        <!-- 根据异常，选择适当的错误页面及statusCode。 -->
+        <pl-valves:handleException defaultPage="error">
+
+            <on-exception type="com.alibaba.citrus.service.template.TemplateNotFoundException"
+                          statusCode="404"
+                          logging="brief" />
+
+            <on-exception type="com.alibaba.citrus.service.moduleloader.ModuleNotFoundException"
+                          statusCode="404"
+                          logging="brief" />
+
+        </pl-valves:handleException>
+
+        <pl-valves:performTemplateScreen />
+        <pl-valves:renderTemplate />
+
+    </services:pipeline>
+
+</beans:beans>

petstore/web/src/main/webapp/WEB-INF/common/pipeline.xml

@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xmlns:services="http://www.alibaba.com/schema/services"
-             xmlns:pl-conditions="http://www.alibaba.com/schema/services/pipeline/conditions"
-             xmlns:pl-valves="http://www.alibaba.com/schema/services/pipeline/valves"
-             xmlns:beans="http://www.springframework.org/schema/beans"
-             xmlns:p="http://www.springframework.org/schema/p"
-             xsi:schemaLocation="
-                http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
-                http://www.alibaba.com/schema/services/pipeline/conditions http://localhost:8080/schema/services-pipeline-conditions.xsd
-                http://www.alibaba.com/schema/services/pipeline/valves http://localhost:8080/schema/services-pipeline-valves.xsd
-                http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
-             ">
-
-    <services:pipeline xmlns="http://www.alibaba.com/schema/services/pipeline/valves">
-
-        <!-- 初始化turbine rundata，并在pipelineContext中设置可能会用到的对象(如rundata、utils)，以便valve取得。 -->
-        <prepareForTurbine />
-
-        <!-- 设置日志系统的上下文，支持把当前请求的详情打印在日志中。 -->
-        <setLoggingContext />
-
-        <!-- 分析URL，取得target。 -->
-        <analyzeURL homepage="homepage" />
-
-        <!-- 检查csrf token，防止csrf攻击和重复提交。假如request和session中的token不匹配，则出错，或显示expired页面。 -->
-        <checkCsrfToken />
-
-        <!-- 检查页面的授权，如果当前用户无权访问该页面，则跳转到petstoreLogin页面 -->
-        <pageAuthorization callbackClass="com.alibaba.sample.petstore.web.common.PetstoreUserAuth" />
-
-        <loop>
-            <choose>
-                <when>
-                    <!-- 执行带模板的screen，默认有layout。 -->
-                    <pl-conditions:target-extension-condition extension="null" />
-                    <performAction />
-                    <performTemplateScreen />
-                    <renderTemplate />
-                </when>
-                <when>
-                    <!-- 执行不带模板的screen，无layout。 -->
-                    <pl-conditions:target-extension-condition extension="do" />
-                    <performAction />
-                    <performScreen />
-                </when>
-                <when>
-                    <!-- 创建JSON，无模板，无layout。 -->
-                    <pl-conditions:target-extension-condition extension="json" />
-                    <performScreen />
-                    <renderResultAsJson />
-                </when>
-                <when>
-                    <!-- 读取资源文件。 -->
-                    <pl-conditions:path-condition name="/petstore/images/(.+)" />
-                    <getResource name="/petstore/images/$1" />
-                </when>
-                <otherwise>
-                    <!-- 将控制交还给servlet engine。 -->
-                    <exit />
-                </otherwise>
-            </choose>
-
-            <!-- 假如rundata.setRedirectTarget()被设置，则循环，否则退出循环。 -->
-            <breakUnlessTargetRedirected />
-        </loop>
-
-    </services:pipeline>
-
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:p="http://www.springframework.org/schema/p"
+             xmlns:services="http://www.alibaba.com/schema/services"
+             xmlns:pl-conditions="http://www.alibaba.com/schema/services/pipeline/conditions"
+             xmlns:pl-valves="http://www.alibaba.com/schema/services/pipeline/valves"
+             xsi:schemaLocation="
+                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+                 http://www.alibaba.com/schema/services/pipeline/conditions http://localhost:8080/schema/services-pipeline-conditions.xsd
+                 http://www.alibaba.com/schema/services/pipeline/valves http://localhost:8080/schema/services-pipeline-valves.xsd
+                 http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+             ">
+
+    <services:pipeline>
+
+        <!-- 初始化turbine rundata，并在pipelineContext中设置可能会用到的对象(如rundata、utils)，以便valve取得。 -->
+        <pl-valves:prepareForTurbine />
+
+        <!-- 设置日志系统的上下文，支持把当前请求的详情打印在日志中。 -->
+        <pl-valves:setLoggingContext />
+
+        <!-- 分析URL，取得target。 -->
+        <pl-valves:analyzeURL homepage="homepage" />
+
+        <!-- 检查csrf token，防止csrf攻击和重复提交。假如request和session中的token不匹配，则出错，或显示expired页面。 -->
+        <pl-valves:checkCsrfToken />
+
+        <!-- 检查页面的授权，如果当前用户无权访问该页面，则跳转到petstoreLogin页面 -->
+        <pl-valves:pageAuthorization callbackClass="com.alibaba.sample.petstore.web.common.PetstoreUserAuth" />
+
+        <pl-valves:loop>
+            <pl-valves:choose>
+                <when>
+                    <!-- 执行带模板的screen，默认有layout。 -->
+                    <pl-conditions:target-extension-condition extension="null" />
+                    <pl-valves:performAction />
+                    <pl-valves:performTemplateScreen />
+                    <pl-valves:renderTemplate />
+                </when>
+                <when>
+                    <!-- 执行不带模板的screen，无layout。 -->
+                    <pl-conditions:target-extension-condition extension="do" />
+                    <pl-valves:performAction />
+                    <pl-valves:performScreen />
+                </when>
+                <when>
+                    <!-- 创建JSON，无模板，无layout。 -->
+                    <pl-conditions:target-extension-condition extension="json" />
+                    <pl-valves:performScreen />
+                    <pl-valves:renderResultAsJson />
+                </when>
+                <when>
+                    <!-- 读取资源文件。 -->
+                    <pl-conditions:path-condition name="/petstore/images/(.+)" />
+                    <pl-valves:getResource name="/petstore/images/$1" />
+                </when>
+                <otherwise>
+                    <!-- 将控制交还给servlet engine。 -->
+                    <pl-valves:exit />
+                </otherwise>
+            </pl-valves:choose>
+
+            <!-- 假如rundata.setRedirectTarget()被设置，则循环，否则退出循环。 -->
+            <pl-valves:breakUnlessTargetRedirected />
+        </pl-valves:loop>
+
+    </services:pipeline>
+
+</beans:beans>

petstore/web/src/main/webapp/WEB-INF/common/resources.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:p="http://www.springframework.org/schema/p"
              xmlns:services="http://www.alibaba.com/schema/services"
              xmlns:res-filters="http://www.alibaba.com/schema/services/resource-loading/filters"
              xmlns:res-loaders="http://www.alibaba.com/schema/services/resource-loading/loaders"
-             xmlns:beans="http://www.springframework.org/schema/beans"
-             xmlns:p="http://www.springframework.org/schema/p"
              xsi:schemaLocation="
-                http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
-                http://www.alibaba.com/schema/services/resource-loading/filters http://localhost:8080/schema/services-resource-loading-filters.xsd
-                http://www.alibaba.com/schema/services/resource-loading/loaders http://localhost:8080/schema/services-resource-loading-loaders.xsd
-                http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
+                 http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd
+                 http://www.alibaba.com/schema/services/resource-loading/filters http://localhost:8080/schema/services-resource-loading-filters.xsd
+                 http://www.alibaba.com/schema/services/resource-loading/loaders http://localhost:8080/schema/services-resource-loading-loaders.xsd
+                 http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd
              ">
 
-    <services:resource-loading xmlns="http://www.alibaba.com/schema/services">
+    <services:resource-loading>
 
         <resource-alias pattern="/" name="/webroot" />
 
@@ -47,4 +47,4 @@
 
     </services:resource-loading>
 
-</beans:beans>
+</beans:beans>