Update configuration key names

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/Configuration.java

@@ -28,8 +28,8 @@ public class Configuration extends Properties {
 
 	public static final String CONFIGURATION_CHANNELS_AUTOSUBSCRIBE = "channels.autosubscribe";
 	public static final String CONFIGURATION_CHANNELS_AUTOSUBSCRIBE_AUTOAPPROVE = "channels.autosubscribe.autoapprove";
-	public static final String CONFIGURATION_CHANNELS_DEFAULT_ROLE = "channels.default.role";
-	public static final String CONFIGURATION_CHANNELS_DEFAULT_ACCESSMODEL = "channels.default.accessmodel";
+	public static final String CONFIGURATION_CHANNELS_DEFAULT_AFFILIATION = "channel.configuration.default.affiliation";
+	public static final String CONFIGURATION_CHANNELS_DEFAULT_ACCESSMODEL = "channel.configuration.default.accessmodel";
 
 	private static final String CONFIGURATION_FILE = "configuration.properties";
 	private static Configuration instance = null;

src/test/resources/configuration.properties

@@ -16,5 +16,11 @@ users.admin = user1@server1;user2@server1
 channels.autosubscribe=channel1@server1;channel2@server1
 channels.autosubscribe.autoapprove=true
 
-channels.default.accessmodel=open
-channels.default.role=member
+channel.configuration.default.accessmodel=open
+channel.configuration.default.affiliation=member
+
+channel.configuration.posts.accessmodel=publisher
+
+channel.configuration.geo.next.accessmodel=authorize
+channel.configuration.geo.current.accessmodel=authorize
+channel.configuration.geo.previous.accessmodel=authorize