Merge pull request #20 from cltlfcjin/master

remove port and bad hashmap code in app
Merge pull request #1 from dianping/master

just sync
Merge pull request #21 from cltlfcjin/master

UT for appnode and change return value of process() in appnode.java from void to boolean
Merge pull request #22 from cltlfcjin/master

1.remove collector.conf 2.use composition instead of inheritance in LogReader 3.initialize port var from config.preperties
Merge pull request #23 from cltlfcjin/master

1.bugfix at HDFSRecovery.java, 2.rm BlackholeException.java, 3.use ParamsKey.java instead of AppConfigurationConstants.java
Merge pull request #2 from dianping/master

sync
refactor, extract PBwrap.java, AgentProtocol.java, use period(second) for app.conf
Merge pull request #24 from ErikFang/master

refactor
Merge pull request #9 from dianping/master

from dianping to jin
small bug fix
Merge pull request #25 from ErikFang/master

small bug fix
Merge pull request #10 from dianping/master

from dianping to jin
add config.properties
Merge pull request #26 from ErikFang/master

add config.properties
Merge pull request #11 from dianping/master

from dianping to jin
big fix
Merge pull request #27 from ErikFang/master

big fix
Merge pull request #12 from dianping/master

from dianping to jin
fix some ut bug like unclose serversocket
revert util.java