diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml index 44ce306a69..4e5a7b7039 100644 --- a/dubbo-admin/pom.xml +++ b/dubbo-admin/pom.xml @@ -1,25 +1,18 @@ -<!-- - - Copyright 1999-2011 Alibaba Group. - - - - Licensed under the Apache License, Version 2.0 (the "License"); - - you may not use this file except in compliance with the License. - - You may obtain a copy of the License at - - - - http://www.apache.org/licenses/LICENSE-2.0 - - - - Unless required by applicable law or agreed to in writing, software - - distributed under the License is distributed on an "AS IS" BASIS, - - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - - See the License for the specific language governing permissions and - - limitations under the License. ---> +<!-- - Copyright 1999-2011 Alibaba Group. - - Licensed under the Apache License, + Version 2.0 (the "License"); - you may not use this file except in compliance + with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 + - - Unless required by applicable law or agreed to in writing, software - + distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the + License for the specific language governing permissions and - limitations + under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; 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";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-admin</artifactId> <packaging>war</packaging> @@ -32,6 +25,62 @@ <skip_maven_deploy>false</skip_maven_deploy> </properties> <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + + </dependency> <dependency> <groupId>com.alibaba</groupId> <artifactId>dubbo</artifactId> @@ -41,10 +90,7 @@ <groupId>com.alibaba.citrus</groupId> <artifactId>citrus-webx-all</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - </dependency> + <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> @@ -134,6 +180,10 @@ <groupId>javax.cache</groupId> <artifactId>cache-api</artifactId> </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </dependency> </dependencies> <build> <plugins> diff --git a/dubbo-admin/src/main/resources/META-INF/spring/dubbo-admin.xml b/dubbo-admin/src/main/resources/META-INF/spring/dubbo-admin.xml index 64cd261eee..f4df945645 100644 --- a/dubbo-admin/src/main/resources/META-INF/spring/dubbo-admin.xml +++ b/dubbo-admin/src/main/resources/META-INF/spring/dubbo-admin.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:context="http://www.springframework.org/schema/context"; + xmlns:loaders="http://www.alibaba.com/schema/services/resource-loading/loaders"; + xmlns:services="http://www.alibaba.com/schema/services"; xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd - http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd + http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd + http://www.alibaba.com/schema/services/resource-loading/loaders http://localhost:8080/schema/services-resource-loading-loaders.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" /> @@ -16,7 +18,7 @@ <value>file://${user.home}/dubbo.properties</value> </list> </property> - </bean> + </bean> <dubbo:application name="dubbo-admin" /> diff --git a/dubbo-admin/src/main/resources/dubbo.properties b/dubbo-admin/src/main/resources/dubbo.properties new file mode 100644 index 0000000000..916bc06618 --- /dev/null +++ b/dubbo-admin/src/main/resources/dubbo.properties @@ -0,0 +1,3 @@ +dubbo.registry.address=zookeeper://101.132.166.112:2181 +dubbo.admin.root.password=root +dubbo.admin.guest.password=guest \ No newline at end of file diff --git a/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-exception.xml b/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-exception.xml index 4e7cbcf09b..fdcdec0c1a 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-exception.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-exception.xml @@ -1,8 +1,8 @@ <?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:conditions="http://www.alibaba.com/schema/services/pipeline/conditions"; + xmlns: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 @@ -11,24 +11,18 @@ 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";> + <services:pipeline id="exceptionPipeline"> <!-- 初始化turbine rundata，并在pipelineContext中设置可能会用到的对象(如rundata、utils)，以便valve取得。 --> - <prepareForTurbine /> + <valves:prepareForTurbine /> <!-- 根据异常，选择适当的错误页面及statusCode。 --> - <handleException defaultPage="error_other.vm"> - <on-exception - type="com.alibaba.citrus.service.template.TemplateNotFoundException" - statusCode="404" page="error_404.vm" /> - <on-exception - type="com.alibaba.citrus.service.moduleloader.ModuleNotFoundException" - statusCode="404" page="error_404.vm" /> - </handleException> - - <performTemplateScreen /> - <renderTemplate /> + <valves:handleException defaultPage="error_other.vm"> + <on-exception type="com.alibaba.citrus.service.template.TemplateNotFoundException" statusCode="404" page="error_404.vm" /> + <on-exception type="com.alibaba.citrus.service.moduleloader.ModuleNotFoundException" statusCode="404" page="error_404.vm" /> + </valves:handleException> + <valves:performTemplateScreen /> + <valves:renderTemplate /> </services:pipeline> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-rpc.xml b/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-rpc.xml index 7fbce0ce43..f31a8c3b7d 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-rpc.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline-rpc.xml @@ -1,8 +1,8 @@ <?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:conditions="http://www.alibaba.com/schema/services/pipeline/conditions"; + xmlns: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 @@ -10,8 +10,7 @@ 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";> + <services:pipeline> <!-- 初始化turbine rundata，并在pipelineContext中设置可能会用到的对象(如rundata、utils)，以便valve取得。 --> <prepareForTurbine /> @@ -30,7 +29,7 @@ class="com.alibaba.dubbo.governance.web.common.interceptor.LocaleValve" /> <choose> <when> - <pl-conditions:path-condition name="^/status$|/favicon.ico" /> + <conditions:path-condition name="^/status$|/favicon.ico" /> </when> <otherwise> <valve @@ -40,18 +39,18 @@ <loop> <choose> <when> - <pl-conditions:target-extension-condition extension="json,jsonp,xml,xhtml" /> + <conditions:target-extension-condition extension="json,jsonp,xml,xhtml" /> <valve class="com.alibaba.citrus.extension.rpc.integration.RPCServiceHandlerValve" /> </when> <when> <!-- 执行不带模板的screen，默认无layout。 --> - <pl-conditions:path-condition + <conditions:path-condition name="/sysinfo/dump.htm|^/\w+$|^/status/.+$" /> <performTemplateScreen /> </when> <when> <!-- 执行带模板的screen，默认有layout。 --> - <pl-conditions:target-extension-condition + <conditions:target-extension-condition extension="null, vm, jsp" /> <performAction /> <performTemplateScreen /> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline.xml b/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline.xml index 2a71b592e8..02c8950ce9 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/common/pipeline.xml @@ -1,67 +1,68 @@ <?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:conditions="http://www.alibaba.com/schema/services/pipeline/conditions"; + xmlns: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"; + xmlns:c="http://www.alibaba.com/schema/services/pipeline/conditions"; + xmlns:v="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 - xmlns="http://www.alibaba.com/schema/services/pipeline/valves";> + <services:pipeline> <!-- 初始化turbine rundata，并在pipelineContext中设置可能会用到的对象(如rundata、utils)，以便valve取得。 --> - <prepareForTurbine /> + <valves:prepareForTurbine /> <!-- 设置日志系统的上下文，支持把当前请求的详情打印在日志中。 --> - <setLoggingContext /> + <valves:setLoggingContext /> <!-- 分析URL，取得target。 --> - <analyzeURL /> + <valves:analyzeURL /> <!-- 检查csrf token，防止csrf攻击和重复提交。假如request和session中的token不匹配，则出错，或显示expired页面。 --> - <checkCsrfToken /> + <valves:checkCsrfToken /> <!-- 拦击器作用 --> - <valve + <v:valve class="com.alibaba.dubbo.governance.web.common.interceptor.LocaleValve" /> - <choose> + <v:choose> <when> - <pl-conditions:path-condition name="^/servicestatus/.+|^/status$|/favicon.ico|/sysinfo/dump.htm" /> + <conditions:path-condition name="^/servicestatus/.+|^/status$|/favicon.ico|/sysinfo/dump.htm" /> </when> <otherwise> - <valve + <v:valve class="com.alibaba.dubbo.governance.web.common.interceptor.AuthorizationValve" /> </otherwise> - </choose> + </v:choose> - <loop> - <choose> + <v:loop> + <v:choose> <when> <!-- 执行不带模板的screen，默认无layout。 --> - <pl-conditions:path-condition + <conditions:path-condition name="/sysinfo/dump.htm|^/\w+$|^/status/.+$" /> - <performTemplateScreen /> + <v:performTemplateScreen /> </when> <when> <!-- 执行带模板的screen，默认有layout。 --> - <pl-conditions:target-extension-condition + <conditions:target-extension-condition extension="null, vm, jsp, html" /> - <performAction /> - <performTemplateScreen /> - <renderTemplate /> + <v:performAction /> + <v:performTemplateScreen /> + <v:renderTemplate /> </when> <otherwise> - <exit /> + <v:exit /> </otherwise> - </choose> + </v:choose> <!-- 假如rundata.setRedirectTarget()被设置，则循环，否则退出循环。 --> - <breakUnlessTargetRedirected /> - </loop> + <valves:breakUnlessTargetRedirected /> + </v:loop> </services:pipeline> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/common/resources.xml b/dubbo-admin/src/main/webapp/WEB-INF/common/resources.xml index a343976700..461d4c152e 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/common/resources.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/common/resources.xml @@ -2,17 +2,22 @@ <beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 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: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"; + xmlns:res-loaders="http://www.alibaba.com/schema/services/resource-loading/loaders"; xsi:schemaLocation=" http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd http://www.alibaba.com/schema/services/resource-loading/filters http://localhost:8080/schema/services-resource-loading-filters.xsd http://www.alibaba.com/schema/services/resource-loading/loaders http://localhost:8080/schema/services-resource-loading-loaders.xsd http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd "> - - <services:resource-loading xmlns="http://www.alibaba.com/schema/services";> + <services:resource-loading> + <resource pattern="/"> + <loaders:webapp-loader /> + </resource> + </services:resource-loading> + <services:resource-loading> <resource-alias pattern="/" name="/webroot" /> <!-- 子模块模板目录：/*/templates --> @@ -20,7 +25,7 @@ <resource-alias pattern="/*/templates/global" name="/webroot/common/templates" /> <!-- 配置文件根目录：/conf --> - <resource-alias pattern="/conf" name="/webroot/WEB-INF" /> + <resource-alias pattern="/conf" name="/webapp/WEB-INF" /> <!-- 内部资源 --> <resource pattern="/webroot" internal="true"> @@ -30,7 +35,7 @@ <res-loaders:classpath-loader /> </resource> - <resource-alias pattern="/templates" name="/webroot/WEB-INF/templates" /> + <resource-alias pattern="/templates" name="/WEB-INF/templates" /> <!--<resource pattern="/templates"> <res-loaders:file-loader basedir="${dubbo.governance.webapp.home}/WEB-INF/templates" /> </resource>--> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/common/uris.xml b/dubbo-admin/src/main/webapp/WEB-INF/common/uris.xml index 6bfd90cc89..c6231fd137 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/common/uris.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/common/uris.xml @@ -1,41 +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:uris="http://www.alibaba.com/schema/services/uris"; - xmlns="http://www.alibaba.com/schema/services/uris"; - xmlns:uri-interceptors="http://www.alibaba.com/schema/services/uris/interceptors"; - 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/uris http://localhost:8080/schema/services-uris.xsd - http://www.alibaba.com/schema/services/uris/interceptors http://localhost:8080/schema/services-uris-interceptors.xsd - http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd - "> - +<?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:services="http://www.alibaba.com/schema/services"; + xmlns:mapping-rules="http://www.alibaba.com/schema/services/mapping-rules"; + xmlns:uris="http://www.alibaba.com/schema/services/uris"; + xsi:schemaLocation=" + http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd + http://www.alibaba.com/schema/services/mapping-rules http://localhost:8080/schema/services-mapping-rules.xsd + http://www.alibaba.com/schema/services/uris http://localhost:8080/schema/services-uris.xsd + http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd + "> <services:uris> - <uri id="server" exposed="true" ></uri> + <uris:uri id="server" exposed="true" ></uris:uri> - <turbine-uri id="rootLink" exposed="true" extends="server"> + <uris:turbine-uri id="rootLink" exposed="true" extends="server"> <componentPath>/</componentPath> - </turbine-uri> + </uris:turbine-uri> <!-- <servlet-content-uri id="rootContextPath" exposed="true" extends="rootLink"> </servlet-content-uri> --> - <turbine-uri id="servicemanageLink" exposed="true" extends="server"> + <uris:turbine-uri id="servicemanageLink" exposed="true" extends="server"> <componentPath>/servicemanage</componentPath> - </turbine-uri> + </uris:turbine-uri> - <turbine-uri id="serviceGovernance" exposed="true" extends="servicemanageLink"> + <uris:turbine-uri id="serviceGovernance" exposed="true" extends="servicemanageLink"> <target>serviceGovernance.vm</target> - </turbine-uri> + </uris:turbine-uri> - <turbine-uri id="registerProvider" exposed="true" extends="servicemanageLink"> + <uris:turbine-uri id="registerProvider" exposed="true" extends="servicemanageLink"> <target>registerProvider.vm</target> - </turbine-uri> + </uris:turbine-uri> </services:uris> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/common/webx-component-and-root.xml b/dubbo-admin/src/main/webapp/WEB-INF/common/webx-component-and-root.xml index c9297e402a..813a381c20 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/common/webx-component-and-root.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/common/webx-component-and-root.xml @@ -1,19 +1,18 @@ <?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:dr-factories="http://www.alibaba.com/schema/services/data-resolver/factories"; + xmlns:factories="http://www.alibaba.com/schema/services/data-resolver/factories"; xmlns:mapping-rules="http://www.alibaba.com/schema/services/mapping-rules"; - xmlns:tpl-engines="http://www.alibaba.com/schema/services/template/engines"; - xmlns:ftl-plugins="http://www.alibaba.com/schema/services/template/engines/freemarker/plugins"; - xmlns:vm-plugins="http://www.alibaba.com/schema/services/template/engines/velocity/plugins"; + xmlns:engines="http://www.alibaba.com/schema/services/template/engines"; + xmlns:plugins="http://www.alibaba.com/schema/services/template/engines/velocity/plugins"; 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/data-resolver/factories http://localhost:8080/schema/services-data-resolver-factories.xsd http://www.alibaba.com/schema/services/mapping-rules http://localhost:8080/schema/services-mapping-rules.xsd http://www.alibaba.com/schema/services/template/engines http://localhost:8080/schema/services-template-engines.xsd - http://www.alibaba.com/schema/services/template/engines/freemarker/plugins http://localhost:8080/schema/services-template-engines-freemarker-plugins.xsd http://www.alibaba.com/schema/services/template/engines/velocity/plugins http://localhost:8080/schema/services-template-engines-velocity-plugins.xsd + http://www.alibaba.com/schema/services/template/engines/freemarker/plugins http://localhost:8080/schema/services-template-engines-freemarker-plugins.xsd http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd "> @@ -21,37 +20,43 @@ <!-- 注意：此文件需要property-placeholder变量：${component}。 --> <!-- Template渲染服务。 --> - <services:template - xmlns="http://www.alibaba.com/schema/services/template/engines"; - searchExtensions="true"> - <velocity-engine templateEncoding="utf-8" - strictReference="false" path="/templates/${component}"> - <global-macros> - <name>global/*.vm</name> - </global-macros> + <services:template searchExtensions="true"> + <engines:velocity-engine templateEncoding="utf-8" + strictReference="false" path="/WEB-INF/templates/${component}"> + <global-macros> + <name>macros/*.vm</name> + </global-macros> + <!-- <plugins:fasttext-support /> --> <plugins> - <!-- <vm-plugins:fasttext-support /> --> - <vm-plugins:renderable-support /> - <!-- <vm-plugins:escape-support defaultEscape="html"> - <vm-plugins:noescape> - <vm-plugins:if-matches pattern="^control\." /> - <vm-plugins:if-matches pattern="^screen_placeholder" /> - <vm-plugins:if-matches pattern="^stringEscapeUtil\.escape" /> - <vm-plugins:if-matches pattern="^csrfToken\.(get)?hiddenField" /> + <plugins:renderable-support /> + </plugins> + <!-- <plugins:escape-support defaultEscape="html"> + <plugins:noescape> + <plugins:if-matches pattern="^control\." /> + <plugins:if-matches pattern="^screen_placeholder" /> + <plugins:if-matches pattern="^stringEscapeUtil\.escape" /> + <plugins:if-matches pattern="^csrfToken\.(get)?hiddenField" /> </vm-plugins:noescape> </vm-plugins:escape-support> --> - </plugins> - </velocity-engine> + + </engines:velocity-engine> <!-- <freemarker-engine templateEncoding="GBK" path="/${component}/templates" /> <jsp-engine path="/templates/${component}" /> --> </services:template> <!-- 名称查找规则。 --> - <services:mapping-rules - xmlns="http://www.alibaba.com/schema/services/mapping-rules";> - + <services:mapping-rules> + + <mapping-rules:extension-rule id="extension"> + <mapping extension="" to="jsp" /> + <mapping extension="php" to="jsp" /> + <mapping extension="jhtml" to="jsp" /> + <mapping extension="vhtml" to="vm" /> + <mapping extension="noext" to="" /> + </mapping-rules:extension-rule> + <!-- External target name => Internal target name --> - <extension-rule id="extension.input"> + <mapping-rules:extension-rule id="extension.input"> <!-- 默认后缀 --> <mapping extension="" to="" /> @@ -64,10 +69,10 @@ <mapping extension="htm" to="" /> <mapping extension="vhtml" to="" /> <mapping extension="vm" to="" /> - </extension-rule> + </mapping-rules:extension-rule> <!-- Internal target name => External target name --> - <extension-rule id="extension.output"> + <mapping-rules:extension-rule id="extension.output"> <!-- 默认后缀 --> <mapping extension="" to="htm" /> @@ -80,33 +85,33 @@ <mapping extension="htm" to="htm" /> <mapping extension="vhtml" to="htm" /> <mapping extension="vm" to="htm" /> - </extension-rule> + </mapping-rules:extension-rule> <!-- Target name => Action module name --> - <direct-module-rule id="action" /> + <mapping-rules:direct-template-rule id="action" templatePrefix=""/> <!-- Target name => Screen module name (*.do) --> - <direct-module-rule id="screen.notemplate" /> + <mapping-rules:direct-template-rule id="screen.notemplate" templatePrefix=""/> <!-- Target name => Screen module name (*.jsp, *.vm) --> - <fallback-module-rule id="screen" moduleType="screen" /> + <mapping-rules:fallback-module-rule id="screen" moduleType="screen" /> <!-- Target name => Screen template name --> - <direct-template-rule id="screen.template" + <mapping-rules:direct-template-rule id="screen.template" templatePrefix="screen" /> <!-- Target name => Layout template name --> - <fallback-template-rule id="layout.template" + <mapping-rules:fallback-template-rule id="layout.template" templatePrefix="layout" /> <!-- Target name => Control module name (setControl method) --> - <direct-module-rule id="control.notemplate" /> + <mapping-rules:direct-template-rule id="control.notemplate" templatePrefix=""/> <!-- Target name => Control module name (setTemplate method) --> - <fallback-module-rule id="control" moduleType="control" /> + <mapping-rules:fallback-module-rule id="control" moduleType="control" /> <!-- Target name => Control template name --> - <direct-template-rule id="control.template" + <mapping-rules:direct-template-rule id="control.template" templatePrefix="control" /> </services:mapping-rules> @@ -117,7 +122,7 @@ <turbine-rundata-resolver /> <parameter-resolver /> <form-resolver /> - <dr-factories:factory + <factories:factory class="com.alibaba.dubbo.governance.web.common.resolver.MapDataResolverFactory" /> </services:data-resolver> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/dubbo.properties b/dubbo-admin/src/main/webapp/WEB-INF/dubbo.properties index c1ec1b3bc2..916bc06618 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/dubbo.properties +++ b/dubbo-admin/src/main/webapp/WEB-INF/dubbo.properties @@ -1,3 +1,3 @@ -dubbo.registry.address=zookeeper://127.0.0.1:2181 +dubbo.registry.address=zookeeper://101.132.166.112:2181 dubbo.admin.root.password=root dubbo.admin.guest.password=guest \ No newline at end of file diff --git a/dubbo-admin/src/main/webapp/WEB-INF/logback.xml b/dubbo-admin/src/main/webapp/WEB-INF/logback.xml new file mode 100644 index 0000000000..b369150b58 --- /dev/null +++ b/dubbo-admin/src/main/webapp/WEB-INF/logback.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration debug="true" scan="true" scanPeriod="1 seconds"> + + <contextName>logback</contextName> + <!--定义参数,后面可以通过${app.name}使用--> + <property name="app.name" value="logback_test"/> + <!--ConsoleAppender 用于在屏幕上输出日志--> + <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender"> + <!--定义了一个过滤器,在LEVEL之下的日志输出不会被打印出来--> + <!--这里定义了DEBUG，也就是控制台不会输出比ERROR级别小的日志--> + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>DEBUG</level> + </filter> + <!-- encoder 默认配置为PatternLayoutEncoder --> + <!--定义控制台输出格式--> + <encoder> + <pattern>%d [%thread] %-5level %logger{36} [%file : %line] - %msg%n</pattern> + </encoder> + </appender> + + <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <!--定义日志输出的路径--> + <!--这里的scheduler.manager.server.home 没有在上面的配置中设定，所以会使用java启动时配置的值--> + <!--比如通过 java -Dscheduler.manager.server.home=/path/to XXXX 配置该属性--> + <file>${scheduler.manager.server.home}/logs/${app.name}.log</file> + <!--定义日志滚动的策略--> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!--定义文件滚动时的文件名的格式--> + <fileNamePattern>${scheduler.manager.server.home}/logs/${app.name}.%d{yyyy-MM-dd.HH}.log.gz + </fileNamePattern> + <!--60天的时间周期，日志量最大20GB--> + <maxHistory>60</maxHistory> + <!-- 该属性在 1.1.6版本后 才开始支持--> + <totalSizeCap>20GB</totalSizeCap> + </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <!--每个日志文件最大100MB--> + <maxFileSize>100MB</maxFileSize> + </triggeringPolicy> + <!--定义输出格式--> + <encoder> + <pattern>%d [%thread] %-5level %logger{36} [%file : %line] - %msg%n</pattern> + </encoder> + </appender> + + <!--root是默认的logger 这里设定输出级别是debug--> + <root level="trace"> + <!--定义了两个appender，日志会通过往这两个appender里面写--> + <appender-ref ref="stdout"/> + <appender-ref ref="file"/> + </root> + + <!--对于类路径以 com.example.logback 开头的Logger,输出级别设置为warn,并且只输出到控制台--> + <!--这个logger没有指定appender，它会继承root节点中定义的那些appender--> + <logger name="com.example.logback" level="warn"/> + + <!--通过 LoggerFactory.getLogger("mytest") 可以获取到这个logger--> + <!--由于这个logger自动继承了root的appender，root中已经有stdout的appender了，自己这边又引入了stdout的appender--> + <!--如果没有设置 additivity="false" ,就会导致一条日志在控制台输出两次的情况--> + <!--additivity表示要不要使用rootLogger配置的appender进行输出--> + <logger name="mytest" level="info" additivity="false"> + <appender-ref ref="stdout"/> + </logger> + + <!--由于设置了 additivity="false" ，所以输出时不会使用rootLogger的appender--> + <!--但是这个logger本身又没有配置appender，所以使用这个logger输出日志的话就不会输出到任何地方--> + <logger name="mytest2" level="info" additivity="false"/> +</configuration> \ No newline at end of file diff --git a/dubbo-admin/src/main/webapp/WEB-INF/webx-governance.xml b/dubbo-admin/src/main/webapp/WEB-INF/webx-governance.xml index 389172d32c..e650dfef14 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/webx-governance.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/webx-governance.xml @@ -1,23 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- Webx Sub Context Configuration. --> -<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:services="http://www.alibaba.com/schema/services"; - xmlns:request-contexts="http://www.alibaba.com/schema/services/request-contexts"; - xmlns:ml-adapters="http://www.alibaba.com/schema/services/module-loader/adapters"; - xmlns:ml-factories="http://www.alibaba.com/schema/services/module-loader/factories"; - 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/request-contexts http://localhost:8080/schema/services-request-contexts.xsd - http://www.alibaba.com/schema/services/module-loader/adapters http://localhost:8080/schema/services-module-loader-adapters.xsd - http://www.alibaba.com/schema/services/module-loader/factories http://localhost:8080/schema/services-module-loader-factories.xsd - http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd - "> +<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:services="http://www.alibaba.com/schema/services"; + xmlns:madapters="http://www.alibaba.com/schema/services/module-loader/adapters"; + xmlns:mfactories="http://www.alibaba.com/schema/services/module-loader/factories"; + xsi:schemaLocation=" + http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd + http://www.alibaba.com/schema/services/module-loader/adapters http://localhost:8080/schema/services-module-loader-adapters.xsd + http://www.alibaba.com/schema/services/module-loader/factories http://localhost:8080/schema/services-module-loader-factories.xsd + http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd + "> <!-- 支持${xxx}替换。 --> <services:property-placeholder> - <services:property key="component">governance</services:property> + <property key="component">governance</property> </services:property-placeholder> <services:pull xmlns="http://www.alibaba.com/schema/services/pull/factories";> @@ -35,9 +32,9 @@ <!-- 装载模块。 --> <services:module-loader> - <ml-factories:class-modules> - <ml-factories:search-packages type="$1" packages="com.alibaba.dubbo.governance.web.governance.module.*" /> - </ml-factories:class-modules> + <mfactories:class-modules> + <search-packages type="$1" packages="com.alibaba.dubbo.governance.web.governance.module.*" /> + </mfactories:class-modules> </services:module-loader> <!-- diff --git a/dubbo-admin/src/main/webapp/WEB-INF/webx-home.xml b/dubbo-admin/src/main/webapp/WEB-INF/webx-home.xml index 5c1dc1b09c..306227664a 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/webx-home.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/webx-home.xml @@ -2,8 +2,8 @@ <!-- Webx Sub Context Configuration. --> <beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:services="http://www.alibaba.com/schema/services"; - xmlns:ml-adapters="http://www.alibaba.com/schema/services/module-loader/adapters"; - xmlns:ml-factories="http://www.alibaba.com/schema/services/module-loader/factories"; + xmlns:madapters="http://www.alibaba.com/schema/services/module-loader/adapters"; + xmlns:mfactories="http://www.alibaba.com/schema/services/module-loader/factories"; xmlns:beans="http://www.springframework.org/schema/beans"; xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation=" @@ -12,10 +12,9 @@ http://www.alibaba.com/schema/services/module-loader/factories http://localhost:8080/schema/services-module-loader-factories.xsd http://www.springframework.org/schema/beans http://localhost:8080/schema/www.springframework.org/schema/beans/spring-beans.xsd "> - <!-- 支持${xxx}替换。 --> <services:property-placeholder> - <services:property key="component">home</services:property> + <property key="component">home</property> </services:property-placeholder> <!-- 共享配置。 --> @@ -27,9 +26,9 @@ <!-- 装载模块。 --> <services:module-loader> - <ml-factories:class-modules> - <ml-factories:search-packages type="$1" packages="com.alibaba.dubbo.governance.web.home.module.*" /> - </ml-factories:class-modules> + <mfactories:class-modules> + <search-packages type="$1" packages="com.alibaba.dubbo.governance.web.home.module.*" /> + </mfactories:class-modules> </services:module-loader> </beans:beans> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/webx-personal.xml b/dubbo-admin/src/main/webapp/WEB-INF/webx-personal.xml index 3cca243b8a..139cd14d7e 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/webx-personal.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/webx-personal.xml @@ -2,8 +2,8 @@ <!-- Webx Sub Context Configuration. --> <beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:services="http://www.alibaba.com/schema/services"; - xmlns:ml-adapters="http://www.alibaba.com/schema/services/module-loader/adapters"; - xmlns:ml-factories="http://www.alibaba.com/schema/services/module-loader/factories"; + xmlns:madapters="http://www.alibaba.com/schema/services/module-loader/adapters"; + xmlns:mfactories="http://www.alibaba.com/schema/services/module-loader/factories"; xmlns:beans="http://www.springframework.org/schema/beans"; xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation=" @@ -15,7 +15,7 @@ <!-- 支持${xxx}替换。 --> <services:property-placeholder> - <services:property key="component">personal</services:property> + <property key="component">personal</property> </services:property-placeholder> <!-- 共享配置。 --> @@ -27,9 +27,9 @@ <!-- 装载模块。 --> <services:module-loader> - <ml-factories:class-modules> - <ml-factories:search-packages type="$1" packages="com.alibaba.dubbo.governance.web.personal.module.*" /> - </ml-factories:class-modules> + <mfactories:class-modules> + <search-packages type="$1" packages="com.alibaba.dubbo.governance.web.personal.module.*" /> + </mfactories:class-modules> </services:module-loader> </beans:beans> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/webx-sysinfo.xml b/dubbo-admin/src/main/webapp/WEB-INF/webx-sysinfo.xml index 0e22edf322..114fa8f6df 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/webx-sysinfo.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/webx-sysinfo.xml @@ -2,8 +2,8 @@ <!-- Webx Sub Context Configuration. --> <beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:services="http://www.alibaba.com/schema/services"; - xmlns:ml-adapters="http://www.alibaba.com/schema/services/module-loader/adapters"; - xmlns:ml-factories="http://www.alibaba.com/schema/services/module-loader/factories"; + xmlns:madapters="http://www.alibaba.com/schema/services/module-loader/adapters"; + xmlns:mfactories="http://www.alibaba.com/schema/services/module-loader/factories"; xmlns:beans="http://www.springframework.org/schema/beans"; xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation=" @@ -15,7 +15,7 @@ <!-- 支持${xxx}替换。 --> <services:property-placeholder> - <services:property key="component">sysinfo</services:property> + <property key="component">sysinfo</property> </services:property-placeholder> <!-- 共享配置。 --> @@ -27,9 +27,9 @@ <!-- 装载模块。 --> <services:module-loader> - <ml-factories:class-modules> - <ml-factories:search-packages type="$1" packages="com.alibaba.dubbo.governance.web.sysinfo.module.*" /> - </ml-factories:class-modules> + <mfactories:class-modules> + <search-packages type="$1" packages="com.alibaba.dubbo.governance.web.sysinfo.module.*" /> + </mfactories:class-modules> </services:module-loader> </beans:beans> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/webx-sysmanage.xml b/dubbo-admin/src/main/webapp/WEB-INF/webx-sysmanage.xml index b15eb61539..a767fc4dbf 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/webx-sysmanage.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/webx-sysmanage.xml @@ -2,8 +2,8 @@ <!-- Webx Sub Context Configuration. --> <beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:services="http://www.alibaba.com/schema/services"; - xmlns:ml-adapters="http://www.alibaba.com/schema/services/module-loader/adapters"; - xmlns:ml-factories="http://www.alibaba.com/schema/services/module-loader/factories"; + xmlns:madapters="http://www.alibaba.com/schema/services/module-loader/adapters"; + xmlns:mfactories="http://www.alibaba.com/schema/services/module-loader/factories"; xmlns:beans="http://www.springframework.org/schema/beans"; xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation=" @@ -15,7 +15,7 @@ <!-- 支持${xxx}替换。 --> <services:property-placeholder> - <services:property key="component">sysmanage</services:property> + <property key="component">sysmanage</property> </services:property-placeholder> <!-- 共享配置。 --> @@ -27,9 +27,9 @@ <!-- 装载模块。 --> <services:module-loader> - <ml-factories:class-modules> - <ml-factories:search-packages type="$1" packages="com.alibaba.dubbo.governance.web.sysmanage.module.*" /> - </ml-factories:class-modules> + <mfactories:class-modules> + <search-packages type="$1" packages="com.alibaba.dubbo.governance.web.sysmanage.module.*" /> + </mfactories:class-modules> </services:module-loader> </beans:beans> diff --git a/dubbo-admin/src/main/webapp/WEB-INF/webx.xml b/dubbo-admin/src/main/webapp/WEB-INF/webx.xml index 26ee43604d..fdc80e5867 100644 --- a/dubbo-admin/src/main/webapp/WEB-INF/webx.xml +++ b/dubbo-admin/src/main/webapp/WEB-INF/webx.xml @@ -7,27 +7,26 @@ xmlns:model-encoders="http://www.alibaba.com/schema/services/request-contexts/session/model-encoders"; xmlns:session-idgens="http://www.alibaba.com/schema/services/request-contexts/session/idgens"; xmlns:session-stores="http://www.alibaba.com/schema/services/request-contexts/session/stores"; - xmlns:ml-adapters="http://www.alibaba.com/schema/services/module-loader/adapters"; - xmlns:ml-factories="http://www.alibaba.com/schema/services/module-loader/factories"; + xmlns:madapters="http://www.alibaba.com/schema/services/module-loader/adapters"; + xmlns:mfactories="http://www.alibaba.com/schema/services/module-loader/factories"; xmlns:beans="http://www.springframework.org/schema/beans"; + xmlns:stores="http://www.alibaba.com/schema/services/request-contexts/session/stores"; xmlns:p="http://www.springframework.org/schema/p"; xmlns:rewrite-handlers="http://www.alibaba.com/schema/services/request-contexts/rewrite/handlers"; xsi:schemaLocation=" http://www.alibaba.com/schema/services http://localhost:8080/schema/services.xsd - http://www.alibaba.com/schema/services/request-contexts http://localhost:8080/schema/services-request-contexts.xsd - http://www.alibaba.com/schema/services/request-contexts/session/encoders http://localhost:8080/schema/services-request-contexts-session-encoders.xsd - http://www.alibaba.com/schema/services/request-contexts/session/idgens http://localhost:8080/schema/services-request-contexts-session-idgens.xsd - http://www.alibaba.com/schema/services/request-contexts/session/stores http://localhost:8080/schema/services-request-contexts-session-stores.xsd - http://www.alibaba.com/schema/services/request-contexts/session/model-encoders http://localhost:8080/schema/services-request-contexts-session-model-encoders.xsd + http://www.alibaba.com/schema/services/request-contexts http://localhost:8080/schema/services-request-contexts.xsd + http://www.alibaba.com/schema/services/request-contexts/session/encoders http://localhost:8080/schema/services-request-contexts-session-encoders.xsd + http://www.alibaba.com/schema/services/request-contexts/session/encrypters http://localhost:8080/schema/services-request-contexts-session-encrypters.xsd + http://www.alibaba.com/schema/services/request-contexts/session/idgens http://localhost:8080/schema/services-request-contexts-session-idgens.xsd + http://www.alibaba.com/schema/services/request-contexts/session/stores http://localhost:8080/schema/services-request-contexts-session-stores.xsd + http://www.alibaba.com/schema/services/request-contexts/session/model-encoders http://localhost:8080/schema/services-request-contexts-session-model-encoders.xsd http://www.alibaba.com/schema/services/module-loader/adapters http://localhost:8080/schema/services-module-loader-adapters.xsd http://www.alibaba.com/schema/services/module-loader/factories http://localhost:8080/schema/services-module-loader-factories.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/request-contexts/rewrite/handlers http://localhost:8080/schema/services-request-contexts-rewrite-handlers.xsd - "> - - <!-- 支持${xxx}替换。 --> + http://www.alibaba.com/schema/services/request-contexts/rewrite/handlers http://localhost:8080/schema/services-request-contexts-rewrite-handlers.xsd";> <services:property-placeholder> - <services:property key="component">common</services:property> + <property key="component">common</property> </services:property-placeholder> <!-- 共享配置。 --> @@ -51,13 +50,14 @@ <!-- 综合设置。 --> <services:webx-configuration> <!-- 默认将productionMode设为true，建议在jetty插件中设置-DproductionMode=false。 --> - <services:productionMode>true</services:productionMode> - <services:components defaultComponent="home" /> + <productionMode>true</productionMode> + <components defaultComponent="home" /> </services:webx-configuration> <!-- 设置request/response/session。 --> - <services:request-contexts xmlns="http://www.alibaba.com/schema/services/request-contexts";> - <rewrite> + <services:request-contexts> + <request-contexts:parser /> + <request-contexts:rewrite> <rule pattern=".*\.htm"> <substitution uri="$0" flags="L,QSA" /> </rule> @@ -68,25 +68,25 @@ class="com.alibaba.dubbo.governance.web.common.interceptor.RestfuleUrlRewriter" /> </handlers> </rule> - </rewrite> - <basic /> - <buffered /> - <lazy-commit /> - <parser /> - <set-locale defaultLocale="zh_CN" defaultCharset="UTF-8" /> - <session> + </request-contexts:rewrite> + <request-contexts:basic /> + <request-contexts:buffered /> + <request-contexts:lazy-commit /> + <request-contexts:parser /> + <request-contexts:set-locale defaultLocale="zh_CN" defaultCharset="UTF-8" /> + <request-contexts:session> <id> <cookie path="/" maxAge="0" httpOnly="true" /> </id> <stores> - <session-stores:cookie-store id="temporaryCookie"> - <session-stores:cookie name="tmp" /> - </session-stores:cookie-store> + <stores:cookie-store id="temporaryCookie"> + <cookie name="tmp" /> + </stores:cookie-store> </stores> <store-mappings> <match name="*" store="temporaryCookie" /> </store-mappings> - </session> + </request-contexts:session> </services:request-contexts> <!-- 支持上传文件。 --> @@ -108,9 +108,9 @@ <!-- 装载模块。 --> <services:module-loader> - <ml-factories:class-modules> - <ml-factories:search-packages type="$1" packages="com.alibaba.dubbo.governance.web.common.module.*" /> - </ml-factories:class-modules> + <mfactories:class-modules> + <search-packages type="$1" packages="com.alibaba.dubbo.governance.web.common.module.*" /> + </mfactories:class-modules> </services:module-loader> <beans:bean id="messageResourceService" class="com.alibaba.dubbo.governance.biz.common.i18n.impl.MessageResourceServiceImpl"> diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 1e9edf86e7..f41abc4f52 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-cluster</artifactId> <packaging>jar</packaging> diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml index 26e31c1e7c..5f8ea0370a 100644 --- a/dubbo-common/pom.xml +++ b/dubbo-common/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-common</artifactId> <packaging>jar</packaging> diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 4affbcc72a..2d63eeeec1 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-config</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-config-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index 274f7791ba..efcda34541 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-config</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-config-spring</artifactId> <packaging>jar</packaging> @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>com.alibaba</groupId> diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml index ed2a84959c..e5a4ae88ab 100644 --- a/dubbo-config/pom.xml +++ b/dubbo-config/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-config</artifactId> <packaging>pom</packaging> diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml index 342964ed50..d27ae6441e 100644 --- a/dubbo-container/dubbo-container-api/pom.xml +++ b/dubbo-container/dubbo-container-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-container-api</artifactId> <packaging>jar</packaging> @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> </dependency> </dependencies> <build> diff --git a/dubbo-container/dubbo-container-jetty/pom.xml b/dubbo-container/dubbo-container-jetty/pom.xml index 31811b18ed..d56aef4b13 100644 --- a/dubbo-container/dubbo-container-jetty/pom.xml +++ b/dubbo-container/dubbo-container-jetty/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-container-jetty</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/dubbo-container-log4j/pom.xml b/dubbo-container/dubbo-container-log4j/pom.xml index adea3aa7e9..da437aa6c5 100644 --- a/dubbo-container/dubbo-container-log4j/pom.xml +++ b/dubbo-container/dubbo-container-log4j/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-container-log4j</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/dubbo-container-logback/pom.xml b/dubbo-container/dubbo-container-logback/pom.xml index 20493bae53..5868d736fa 100644 --- a/dubbo-container/dubbo-container-logback/pom.xml +++ b/dubbo-container/dubbo-container-logback/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-container-logback</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml index 30a7a299d6..6bca711707 100644 --- a/dubbo-container/dubbo-container-spring/pom.xml +++ b/dubbo-container/dubbo-container-spring/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-container-spring</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml index b8738814cb..99985b56c9 100644 --- a/dubbo-container/pom.xml +++ b/dubbo-container/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-container</artifactId> <packaging>pom</packaging> diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml index 849c3e6532..14b53d3419 100644 --- a/dubbo-demo/dubbo-demo-api/pom.xml +++ b/dubbo-demo/dubbo-demo-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-demo</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-demo-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml index e518cff2c0..0dd8b52b85 100644 --- a/dubbo-demo/dubbo-demo-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-consumer/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-demo</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-demo-consumer</artifactId> <packaging>jar</packaging> @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.javassist</groupId> diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml index c7970f1239..9beb4dca33 100644 --- a/dubbo-demo/dubbo-demo-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-provider/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-demo</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-demo-provider</artifactId> <packaging>jar</packaging> @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.javassist</groupId> diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml index 05b065c721..20aa9e89a6 100644 --- a/dubbo-demo/pom.xml +++ b/dubbo-demo/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-demo</artifactId> <packaging>pom</packaging> diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml index c5fb695316..db731c3c0d 100644 --- a/dubbo-filter/dubbo-filter-cache/pom.xml +++ b/dubbo-filter/dubbo-filter-cache/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-filter</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-filter-cache</artifactId> <packaging>jar</packaging> diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml index 43af382509..7ed454c5d7 100644 --- a/dubbo-filter/dubbo-filter-validation/pom.xml +++ b/dubbo-filter/dubbo-filter-validation/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-filter</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-filter-validation</artifactId> <packaging>jar</packaging> diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml index 8a50206a4d..1ba04469e5 100644 --- a/dubbo-filter/pom.xml +++ b/dubbo-filter/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-filter</artifactId> <packaging>pom</packaging> diff --git a/dubbo-maven/pom.xml b/dubbo-maven/pom.xml index 3df8cb6e8f..152157b535 100644 --- a/dubbo-maven/pom.xml +++ b/dubbo-maven/pom.xml @@ -44,7 +44,7 @@ <dependencies> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> <version>2.5.6.SEC03</version> </dependency> <dependency> diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml index 19df1ae264..eebbf5c548 100644 --- a/dubbo-monitor/dubbo-monitor-api/pom.xml +++ b/dubbo-monitor/dubbo-monitor-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-monitor</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-monitor-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml index a4e398bcd3..4c034503d8 100644 --- a/dubbo-monitor/dubbo-monitor-default/pom.xml +++ b/dubbo-monitor/dubbo-monitor-default/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-monitor</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-monitor-default</artifactId> <packaging>jar</packaging> diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml index a5c516f6ae..f346e961a1 100644 --- a/dubbo-monitor/pom.xml +++ b/dubbo-monitor/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-monitor</artifactId> <packaging>pom</packaging> diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index 21e51e1df3..92aa6c0bbf 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-registry-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-default/pom.xml b/dubbo-registry/dubbo-registry-default/pom.xml index 616cd82a01..7ea416f5aa 100644 --- a/dubbo-registry/dubbo-registry-default/pom.xml +++ b/dubbo-registry/dubbo-registry-default/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-registry-default</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-multicast/pom.xml b/dubbo-registry/dubbo-registry-multicast/pom.xml index 31f9e46bf7..85774f7a11 100644 --- a/dubbo-registry/dubbo-registry-multicast/pom.xml +++ b/dubbo-registry/dubbo-registry-multicast/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-registry-multicast</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-redis/pom.xml b/dubbo-registry/dubbo-registry-redis/pom.xml index 89480310c5..349e4a8ea1 100644 --- a/dubbo-registry/dubbo-registry-redis/pom.xml +++ b/dubbo-registry/dubbo-registry-redis/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-registry-redis</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-zookeeper/pom.xml b/dubbo-registry/dubbo-registry-zookeeper/pom.xml index b42217d30c..7cf34d9617 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/pom.xml +++ b/dubbo-registry/dubbo-registry-zookeeper/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-registry-zookeeper</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml index 47161e2cfc..7ce9736309 100644 --- a/dubbo-registry/pom.xml +++ b/dubbo-registry/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-registry</artifactId> <packaging>pom</packaging> diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml index 3c3195105e..e96db8aaf8 100644 --- a/dubbo-remoting/dubbo-remoting-api/pom.xml +++ b/dubbo-remoting/dubbo-remoting-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannel.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannel.java index 0bd04baa47..563482cf8e 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannel.java @@ -27,21 +27,21 @@ */ public abstract class AbstractChannel extends AbstractPeer implements Channel { - public AbstractChannel(URL url, ChannelHandler handler){ - super(url, handler); - } + public AbstractChannel(URL url, ChannelHandler handler) { + super(url, handler); + } - public void send(Object message, boolean sent) throws RemotingException { - if (isClosed()) { - throw new RemotingException(this, "Failed to send message " - + (message == null ? "" : message.getClass().getName()) + ":" + message - + ", cause: Channel closed. channel: " + getLocalAddress() + " -> " + getRemoteAddress()); - } - } + public void send(Object message, boolean sent) throws RemotingException { + if (isClosed()) { + throw new RemotingException(this, + "Failed to send message " + (message == null ? "" : message.getClass().getName()) + ":" + message + + ", cause: Channel closed. channel: " + getLocalAddress() + " -> " + getRemoteAddress()); + } + } - @Override - public String toString() { - return getLocalAddress() + " -> " + getRemoteAddress(); - } + @Override + public String toString() { + return getLocalAddress() + " -> " + getRemoteAddress(); + } } \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml index 4aac70bd47..b168c4c32b 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml +++ b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting-grizzly</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml index 8b30a08a74..ea43803e46 100644 --- a/dubbo-remoting/dubbo-remoting-http/pom.xml +++ b/dubbo-remoting/dubbo-remoting-http/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting-http</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-mina/pom.xml b/dubbo-remoting/dubbo-remoting-mina/pom.xml index 7cd615a50e..0f25e59a76 100644 --- a/dubbo-remoting/dubbo-remoting-mina/pom.xml +++ b/dubbo-remoting/dubbo-remoting-mina/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting-mina</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml index 125b9569fc..8a216393e7 100644 --- a/dubbo-remoting/dubbo-remoting-netty/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting-netty</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-p2p/pom.xml b/dubbo-remoting/dubbo-remoting-p2p/pom.xml index c6c51811f9..a998c74967 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/pom.xml +++ b/dubbo-remoting/dubbo-remoting-p2p/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting-p2p</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml index 2564ffc125..bfc29bcd83 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting-zookeeper</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml index 3b2b630a8e..293c1904e5 100644 --- a/dubbo-remoting/pom.xml +++ b/dubbo-remoting/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-remoting</artifactId> <packaging>pom</packaging> diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml index 6cf1777589..b297cd913f 100644 --- a/dubbo-rpc/dubbo-rpc-api/pom.xml +++ b/dubbo-rpc/dubbo-rpc-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-default/pom.xml b/dubbo-rpc/dubbo-rpc-default/pom.xml index 906ba76bd0..d73bcef65b 100644 --- a/dubbo-rpc/dubbo-rpc-default/pom.xml +++ b/dubbo-rpc/dubbo-rpc-default/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-default</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-hessian/pom.xml b/dubbo-rpc/dubbo-rpc-hessian/pom.xml index 5002898948..d22985b626 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc/dubbo-rpc-hessian/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-hessian</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-http/pom.xml b/dubbo-rpc/dubbo-rpc-http/pom.xml index 9eb8901c8d..031190f81d 100644 --- a/dubbo-rpc/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc/dubbo-rpc-http/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-http</artifactId> <packaging>jar</packaging> @@ -41,7 +41,11 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> </dependency> </dependencies> </project> \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java b/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java index 84bc398a3f..35cb5a14c9 100644 --- a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java +++ b/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.remoting.RemoteAccessException; -import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor; +import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor; import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean; import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; import org.springframework.remoting.httpinvoker.SimpleHttpInvokerRequestExecutor; @@ -128,7 +128,7 @@ protected void prepareConnection(HttpURLConnection con, }; httpProxyFactoryBean.setHttpInvokerRequestExecutor(httpInvokerRequestExecutor); } else if ("commons".equals(client)) { - CommonsHttpInvokerRequestExecutor httpInvokerRequestExecutor = new CommonsHttpInvokerRequestExecutor(); + HttpComponentsHttpInvokerRequestExecutor httpInvokerRequestExecutor = new HttpComponentsHttpInvokerRequestExecutor(); httpInvokerRequestExecutor.setReadTimeout(url.getParameter(Constants.CONNECT_TIMEOUT_KEY, Constants.DEFAULT_CONNECT_TIMEOUT)); httpProxyFactoryBean.setHttpInvokerRequestExecutor(httpInvokerRequestExecutor); } else if (client != null && client.length() > 0) { diff --git a/dubbo-rpc/dubbo-rpc-injvm/pom.xml b/dubbo-rpc/dubbo-rpc-injvm/pom.xml index cf4f500888..302510c6c8 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/pom.xml +++ b/dubbo-rpc/dubbo-rpc-injvm/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-injvm</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-memcached/pom.xml b/dubbo-rpc/dubbo-rpc-memcached/pom.xml index dfcde46c0f..3910bff169 100644 --- a/dubbo-rpc/dubbo-rpc-memcached/pom.xml +++ b/dubbo-rpc/dubbo-rpc-memcached/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-memcached</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-redis/pom.xml b/dubbo-rpc/dubbo-rpc-redis/pom.xml index 86902eb96b..6fa899534b 100644 --- a/dubbo-rpc/dubbo-rpc-redis/pom.xml +++ b/dubbo-rpc/dubbo-rpc-redis/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-redis</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-rmi/pom.xml b/dubbo-rpc/dubbo-rpc-rmi/pom.xml index ef5e72215b..0833691285 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rmi/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-rmi</artifactId> <packaging>jar</packaging> @@ -36,7 +36,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> <scope>provided</scope> <optional>true</optional> </dependency> diff --git a/dubbo-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-rpc/dubbo-rpc-thrift/pom.xml index b632539bee..cc225bd642 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/pom.xml +++ b/dubbo-rpc/dubbo-rpc-thrift/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-thrift</artifactId> <packaging>jar</packaging> @@ -55,7 +55,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> <scope>provided</scope> <optional>true</optional> </dependency> diff --git a/dubbo-rpc/dubbo-rpc-webservice/pom.xml b/dubbo-rpc/dubbo-rpc-webservice/pom.xml index 2e38db44a6..e760120048 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/pom.xml +++ b/dubbo-rpc/dubbo-rpc-webservice/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc-webservice</artifactId> <packaging>jar</packaging> @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> <scope>provided</scope> <optional>true</optional> </dependency> diff --git a/dubbo-rpc/pom.xml b/dubbo-rpc/pom.xml index f2ec70b583..74058c0264 100644 --- a/dubbo-rpc/pom.xml +++ b/dubbo-rpc/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-rpc</artifactId> <packaging>pom</packaging> diff --git a/dubbo-simple/dubbo-monitor-simple/pom.xml b/dubbo-simple/dubbo-monitor-simple/pom.xml index ece10d4210..0001df5bcf 100644 --- a/dubbo-simple/dubbo-monitor-simple/pom.xml +++ b/dubbo-simple/dubbo-monitor-simple/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-simple</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-monitor-simple</artifactId> <packaging>jar</packaging> @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.javassist</groupId> diff --git a/dubbo-simple/dubbo-registry-simple/pom.xml b/dubbo-simple/dubbo-registry-simple/pom.xml index 4de8766a16..33c090c6d2 100644 --- a/dubbo-simple/dubbo-registry-simple/pom.xml +++ b/dubbo-simple/dubbo-registry-simple/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-simple</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-registry-simple</artifactId> <packaging>jar</packaging> diff --git a/dubbo-simple/pom.xml b/dubbo-simple/pom.xml index 523164e392..dddd9f7840 100644 --- a/dubbo-simple/pom.xml +++ b/dubbo-simple/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-simple</artifactId> <packaging>pom</packaging> diff --git a/dubbo-test/dubbo-test-benchmark/pom.xml b/dubbo-test/dubbo-test-benchmark/pom.xml index ae1ea13548..0605cda9f6 100644 --- a/dubbo-test/dubbo-test-benchmark/pom.xml +++ b/dubbo-test/dubbo-test-benchmark/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-test-benchmark</artifactId> <packaging>jar</packaging> diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml b/dubbo-test/dubbo-test-compatibility/pom.xml index 7f7bfe113c..0389eddae9 100644 --- a/dubbo-test/dubbo-test-compatibility/pom.xml +++ b/dubbo-test/dubbo-test-compatibility/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-test-compatibility</artifactId> <packaging>jar</packaging> diff --git a/dubbo-test/dubbo-test-examples/pom.xml b/dubbo-test/dubbo-test-examples/pom.xml index aa9639ec76..b3cf529f6e 100644 --- a/dubbo-test/dubbo-test-examples/pom.xml +++ b/dubbo-test/dubbo-test-examples/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-test-examples</artifactId> <packaging>jar</packaging> diff --git a/dubbo-test/dubbo-test-integration/pom.xml b/dubbo-test/dubbo-test-integration/pom.xml index 52258d76c2..c88dc27298 100644 --- a/dubbo-test/dubbo-test-integration/pom.xml +++ b/dubbo-test/dubbo-test-integration/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-test-integration</artifactId> <packaging>jar</packaging> diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 37189c188e..48c9a7fc5c 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo-test</artifactId> <packaging>pom</packaging> diff --git a/dubbo/pom.xml b/dubbo/pom.xml index 52f38760de..bf539fadfd 100644 --- a/dubbo/pom.xml +++ b/dubbo/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>dubbo</artifactId> <packaging>jar</packaging> diff --git a/hessian-lite/pom.xml b/hessian-lite/pom.xml index 24af1c7831..5e8db42706 100644 --- a/hessian-lite/pom.xml +++ b/hessian-lite/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> </parent> <artifactId>hessian-lite</artifactId> <packaging>jar</packaging> diff --git a/pom.xml b/pom.xml index 7cdbfb61a0..9bf3c642db 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ </parent>--> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>5.1.2</version> <packaging>pom</packaging> <name>${project.artifactId}</name> <description>The parent project of dubbo</description> @@ -86,9 +86,9 @@ </profiles> <properties> <!-- Common libs --> - <spring_version>2.5.6.SEC03</spring_version> + <spring_version>5.1.2.RELEASE</spring_version> <javassist_version>3.15.0-GA</javassist_version> - <netty_version>3.2.5.Final</netty_version> + <netty_version>3.2.10.Final</netty_version> <mina_version>1.1.7</mina_version> <grizzly_version>2.1.4</grizzly_version> <httpclient_version>4.1.2</httpclient_version> @@ -97,7 +97,7 @@ <fastjson_version>1.1.39</fastjson_version> <bsf_version>3.1</bsf_version> <sorcerer_version>0.8</sorcerer_version> - <zookeeper_version>3.3.3</zookeeper_version> + <zookeeper_version>3.5.3-beta</zookeeper_version> <zkclient_version>0.1</zkclient_version> <curator_version>1.1.16</curator_version> <jedis_version>2.1.0</jedis_version> @@ -114,12 +114,13 @@ <sca_version>2.0-M5.1</sca_version> <guice_version>3.0</guice_version> <cglib_version>2.2</cglib_version> - <webx_version>3.0.8</webx_version> + <webx_version>5.1.2</webx_version> + <velocity_version>1.7</velocity_version> <!-- Log libs --> <slf4j_version>1.6.2</slf4j_version> <jcl_version>1.1</jcl_version> <log4j_version>1.2.16</log4j_version> - <logback_version>1.0.6</logback_version> + <logback_version>1.1.7</logback_version> <!-- Test libs --> <junit_version>4.10</junit_version> <easymock_version>3.0</easymock_version> @@ -136,8 +137,8 @@ <!-- for maven compiler plugin --> <maven_compiler_plugin_version>2.3.2</maven_compiler_plugin_version> - <java_source_version>1.5</java_source_version> - <java_target_version>1.5</java_target_version> + <java_source_version>1.8</java_source_version> + <java_target_version>1.8</java_target_version> <file_encoding>UTF-8</file_encoding> <maven_source_plugin_version>2.1.1</maven_source_plugin_version> @@ -151,9 +152,60 @@ <!-- Common libs --> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> + <artifactId>spring-context</artifactId> <version>${spring_version}</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${spring_version}</version> + </dependency> + <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> @@ -293,6 +345,44 @@ <groupId>com.alibaba.citrus</groupId> <artifactId>citrus-webx-all</artifactId> <version>${webx_version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Log libs --> <dependency> @@ -350,6 +440,11 @@ <artifactId>cglib-nodep</artifactId> <version>${cglib_version}</version> </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>${velocity_version}</version> + </dependency> </dependencies> </dependencyManagement> <dependencies>
With regards, Apache Git Services
