fix incorrect placement of context:component-scan tags

There are still issues present after clearing up the transactions, but this merge is a step towards working code.