Merge pull request #6 from One-Platform/master

update master
修改配置文件
Merge branch 'master' of https://github.com/shmilbin1570/example

Conflicts:
	showcase/src/main/resources/spring/applicationContext.xml
Merge applicationContext.xml
增加Webservice测试用例
Merge pull request #7 from One-Platform/master

update master
Merge pull request #8 from One-Platform/master

update master
增加WebService帮助文档
增加WebServiceController
该修showcase_webservice.jsp链接
增加showcase_webservice.jsp链接
Merge pull request #17 from shmilbin1570/master

增加Webservice的帮助文档及链接
Merge pull request #5 from One-Platform/master

从ONE上pull下来最新的工程
删除对monitor：：log的依赖
Merge branch 'master' of https://github.com/zhangfanba/example.git
Merge pull request #18 from zhangfanba/master

删除依赖：com.sinosoft.one.monitor.log
Merge pull request #1 from One-Platform/master

update