Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.39 -r1.40
--- lams_admin/conf/language/lams/ApplicationResources.properties	21 May 2008 08:51:27 -0000	1.39
+++ lams_admin/conf/language/lams/ApplicationResources.properties	4 Jul 2008 02:06:08 -0000	1.40
@@ -363,6 +363,8 @@
 cache.explanation3  =Warning: If you remove a node, you will remove the node and all its child nodes.
 msg.ldap.synchronise.intro  =This feature allows you to synchronise LAMS' database with your LDAP server.  This includes updating existing users' profile and adding them to the LAMS group which matches their attributes.
 msg.import.3  =Download the roles template to add users to groups/subgroups and assign their roles.
+config.gmap.section.title =Gmap Settings
+config.gmap.gmapkey  =Google Map key.
 
 
 #======= End labels: Exported 356 labels for en AU =====
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v
diff -u -r1.25 -r1.26
--- lams_common/db/sql/insert_lams_unix_config_data.sql	17 Jun 2008 02:07:36 -0000	1.25
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	4 Jul 2008 02:05:58 -0000	1.26
@@ -1,5 +1,5 @@
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('ServerURL','http://shaun.melcoe.mq.edu.au/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
+values ('ServerURL','http://192.168.111.40:8080/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v
diff -u -r1.21 -r1.22
--- lams_common/db/sql/insert_lams_windows_config_data.sql	17 Jun 2008 02:03:32 -0000	1.21
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	4 Jul 2008 02:05:58 -0000	1.22
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/insert_rams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_unix_config_data.sql,v
diff -u -r1.15 -r1.16
--- lams_common/db/sql/insert_rams_unix_config_data.sql	17 Jun 2008 02:03:32 -0000	1.15
+++ lams_common/db/sql/insert_rams_unix_config_data.sql	4 Jul 2008 02:05:58 -0000	1.16
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
Index: lams_common/db/sql/insert_rams_windows_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_windows_config_data.sql,v
diff -u -r1.12 -r1.13
--- lams_common/db/sql/insert_rams_windows_config_data.sql	17 Jun 2008 02:07:36 -0000	1.12
+++ lams_common/db/sql/insert_rams_windows_config_data.sql	4 Jul 2008 02:05:58 -0000	1.13
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/updatescripts/alter_211_gmap.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/updatescripts/Attic/alter_211_gmap.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/db/sql/updatescripts/alter_211_gmap.sql	4 Jul 2008 02:05:59 -0000	1.1
@@ -0,0 +1,4 @@
+-- FOR LAMS 2.1.1 
+-- Adding a configuration entry into for the google map api key
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)  values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v
diff -u -r1.34 -r1.35
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	10 Apr 2008 06:37:22 -0000	1.34
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	4 Jul 2008 02:05:57 -0000	1.35
@@ -225,4 +225,6 @@
 	public static String LEARNER_SCREEN_SIZE = "LearnerScreenSize";
 	public static String ADMIN_SCREEN_SIZE = "AdminScreenSize";
 	
+	public static String GMAP_KEY = "GmapKey";
+	
 }
\ No newline at end of file