[canl-java-javadoc] Tidy up spec file and sources.