Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.8.5 #210

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

2.8.5 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cfd611d
update spring to 4.x and add log4j2 support
Feb 24, 2016
5dd65e3
update FST to lastest version
Feb 25, 2016
3a61a8b
recover dubbo-admin to spring 3.x
Feb 29, 2016
be9b679
change zkclient version to 0.8.1
Feb 29, 2016
688436d
add primitive thrift and hadoop avro support
Mar 6, 2016
5c1a977
add primitive thrift and hadoop avro support
Mar 6, 2016
fa615fb
add primitive thrift and hadoop avro support
Mar 6, 2016
711c6fa
add primitive thrift and hadoop avro support
Mar 6, 2016
d436cab
fix dubbo-admin compile error
Mar 6, 2016
d43e86b
update comment
Mar 6, 2016
67b84c5
update cxf to 3.0.5 (warning: maybe exists bug!)
Mar 24, 2016
8dd6c42
fix dubbo-admin cannot run in spring lastest version
Apr 3, 2016
e049153
bugfix fix hibernate-validator and make zkclient-0.8.1 to zkclient-0.…
xydonne Jun 15, 2016
1bf93b8
Merge pull request #1 from xydonne/yjmyzz-dubbox
yjmyzz Jun 17, 2016
b4f10ab
thrift balance
Aug 25, 2016
00c39d5
fix avro load balance bug
Sep 5, 2016
8404249
fix avro-protocal load balance bug
Sep 5, 2016
53ff79d
add upload-to-nexus config sample
yjmyzz Sep 5, 2016
8535e8d
update zkclient to 0.9
Sep 18, 2016
d0c8a93
update zkclient to 0.9
Sep 18, 2016
9cafeda
grpc
Oct 6, 2016
878b8af
增加grpc的支持
Oct 8, 2016
f2752cc
modify readme
Oct 8, 2016
02bbf68
change readme
Oct 8, 2016
d1a8f0b
change readme
Oct 8, 2016
6f7a94d
grpc
Nov 2, 2016
9238a83
add rpc-grpc protocal
Nov 15, 2016
d8ae6e0
增加grpc 1.0的支持，重写dubbo-demo模块,提供了rest/dubbo/avro/thrift/grpc五种协议的基本示例
Dec 25, 2016
6883598
增加了google-gRPC-1.0.1的支持,重写了dubbo-demo模块，提供了rest/dubbo/avro/thrift/grp…
Dec 25, 2016
31867f4
小修改
Dec 25, 2016
0101b1b
thrift ThreadedSelectorServer 服务器
raoshaoquan Feb 27, 2017
898aac7
修改thrift默认协议为 TBinaryProtocol
raoshaoquan Mar 3, 2017
970be29
暂时回滚thrift2
raoshaoquan Mar 3, 2017
067ede1
路由规则匹配
raoshaoquan Mar 16, 2017
7386e10
Merge pull request #2 from raoshaoquan/2.8.5
yjmyzz Jun 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ target/
*.iws

# temp ignore
log.*
*.log
*.cache
*.diff
Expand Down
12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ Dubbox adds features like RESTful remoting, Kyro/FST serialization, etc to the p

* **修正了dubbo的bug** 包括配置、序列化、管理界面等等的bug。

* **支持原生thrift、avro等跨语言的rpc框架**(2.8.4a版开始支持)，只是非java语言的client调用dubbo的thrift/avro服务时，consumer无法享受dubbo的治理功能

**注：dubbox和dubbo 2.x是兼容的，没有改变dubbo的任何已有的功能和配置方式（除了升级了spring之类的版本）**

## 文档资料
Expand Down Expand Up @@ -70,6 +72,16 @@ Dubbox adds features like RESTful remoting, Kyro/FST serialization, etc to the p
* 修正Dubbo管理界面中没有consumer时出现空指针异常（马金凯）
* 修正@Reference annotation中protocol设置不起作用的bug（沈理）
* 修正@Reference annotation放在setter方法上即会出错的bug（Dylan）
* **dubbox-2.8.4a**：
* 升级spring到4.x,其它一些依赖组件也一并进行了版本升级(杨俊明)
* 增加log4j2支持,原来一些硬编码依赖log4j的代码,改为依赖slf4j,以便兼容其它一些主流日志组件(杨俊明)
* 增加原生thrift支持,升级thrift到0.9.3,为避免与dubbo原来的thrift实现命名冲突，新增的原生thrift协议，协议名称改为thrift2(杨俊明)
* 增加hadoop avro支持(杨俊明)
* **dubbox-2.8.5**：
* 编译时去掉了一些不常用的模块，以加快项目整体的编译速度（杨俊明）
* 增加了google-gRPC-1.0.1的支持，目前仅处于“玩票”阶段，生产环境请慎用（杨俊明）
* 重写了dubbo-demo模块，提供了rest/dubbo/avro/thrift/grpc五种协议的基本示例(杨俊明)
* 将zkclient 0.8.1加入项目中，避免大家编译时，要先去pull另一个项目(杨俊明)

## 依赖

Expand Down
300 changes: 161 additions & 139 deletions dubbo-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,153 +1,175 @@
<!--
- 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.8.4</version>
</parent>
<artifactId>dubbo-admin</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<description>The admin module of dubbo project</description>
<properties>
<wtpversion>1.5</wtpversion>
<wtpContextName>/</wtpContextName>
<eclipse.useProjectReferences>false</eclipse.useProjectReferences>
<skip_maven_deploy>false</skip_maven_deploy>
</properties>
<dependencies>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.citrus</groupId>
<artifactId>citrus-webx-all</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bsf</groupId>
<artifactId>bsf-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
<groupId>com.github.sgroschupf</groupId>
<artifactId>zkclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.xmemcached</groupId>
<artifactId>xmemcached</artifactId>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty_version}</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
</configuration>
</plugin>
</plugins>
</build>
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>
<!--注:dubbo-admin用的web框架,不支持最新的spring,所以该项目仍然维护2.8.4-->
<version>2.8.4a</version>
</parent>
<artifactId>dubbo-admin</artifactId>
<packaging>war</packaging>
<name>${project.artifactId}</name>
<description>The admin module of dubbo project</description>
<properties>
<wtpversion>1.5</wtpversion>
<wtpContextName>/</wtpContextName>
<eclipse.useProjectReferences>false</eclipse.useProjectReferences>
<skip_maven_deploy>false</skip_maven_deploy>
<maven-jetty-plugin_version>8.1.15.v20140411</maven-jetty-plugin_version>
<spring.bom.version>3.2.16.RELEASE</spring.bom.version>
</properties>
<dependencies>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.citrus</groupId>
<artifactId>citrus-webx-all</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bsf</groupId>
<artifactId>bsf-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>zkclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.xmemcached</groupId>
<artifactId>xmemcached</artifactId>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<!-- 配置Tomcat插件 -->
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
<configuration>
<port>8080</port>
<path>/</path>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${maven-jetty-plugin_version}</version>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>8080</port>
</connector>
</connectors>
<stopKey>exit</stopKey>
<stopPort>9090</stopPort>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppConfig>
<contextPath>/${project.artifactId}</contextPath>
<!--<contextPath>/</contextPath>-->
</webAppConfig>
</configuration>
</plugin>
</plugins>
</build>
</project>

Loading