Having both application.properties and gateway.properties is quite confusing.

Also, the two main context files (application-context-main.xml and application-context.xml) don't reference the same .properties file. One references application.properties while the other references gateway.properties.