add java txt
master merge branch2