Fixed configuration - realized I both over-complicated and broke the way modules were configured, so now we're pretty much back where we started. Default properties (suitable for testing) are included in the jars under /META-INF/spring/ and apps can override the defaults by suppling properti values through PropertySources with higher precedence.