revert
REVERT
Revert "revert"

This reverts commit 81d8f64a84b48b5879a5b57ad2996dca3e786fd9.
move spring configuration to groovy