JBIDE-16358 convert catalog to a standalone catalog.xml file. Also updated the generation script