add shipping rule and generate javadoc
 merge