Lps 39362 SF

Hi James,

1) Please simplify the logic after you make changes.
2) Pay attention to blank line usage and naming rule, if you don't know how to do, you can check current code, or you can also check change log list of trunk for Brian's SF.
3) How did you run "ant format-source", I still can see a new file "init.jsp" modified after I run "ant format-source"


Tina.