Use Java 7 RowSetFactory
Move geocatalog