Updated AFT-CLietn and AFT-Servlet to java7