完整的j2ee框架代码
Merge branch 'master' of https://mymmsc@github.com/mymmsc/java-j2ee

Conflicts:
	.classpath
	build.xml