java server commit
Revert "java server commit"

This reverts commit f4cd8ec90f322d5808d01f02479625a187dc7d24.
recommit of the java server