Swapped out hibernate for spring jdbc and added liquibase for migrations. Created integration tests for DAO and converted webapp data source to JNDI... having problems with closed connections - currently not working or compiling.
Got transactions to work and cleaned up some redundant annotation params. Had to switch DataSource back to local connection - for some reason the JNDI keeps failing a "closed", will need to look into that later.