Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra0b4b138796403af9ee557f34ddebfbb1e20ca75 -r2d9ae14753290cda30c195c64423c93062fa8e17
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a0b4b138796403af9ee557f34ddebfbb1e20ca75)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d9ae14753290cda30c195c64423c93062fa8e17)
@@ -21,7 +21,6 @@
 label.authoring.basic.authored  =Authored
 label.authoring.basic.map  =Map:
 label.authoring.basic.centerMap =Center map on location:
-label.authoring.basic.sampleAddress  =Macquarie University, Sydney NSW
 label.authoring.basic.confirmDelete  =Are you sure you want to remove this marker?
 error.missingMarkerTitle  =Title is required for marker.
 error.cantFindAddress  =Unable to find location:
Index: lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra0b4b138796403af9ee557f34ddebfbb1e20ca75 -r2d9ae14753290cda30c195c64423c93062fa8e17
--- lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a0b4b138796403af9ee557f34ddebfbb1e20ca75)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2d9ae14753290cda30c195c64423c93062fa8e17)
@@ -21,7 +21,6 @@
 label.authoring.basic.authored  =Authored
 label.authoring.basic.map  =Map:
 label.authoring.basic.centerMap =Center map on location:
-label.authoring.basic.sampleAddress  =Macquarie University, Sydney NSW
 label.authoring.basic.confirmDelete  =Are you sure you want to remove this marker?
 error.missingMarkerTitle  =Title is required for marker.
 error.cantFindAddress  =Unable to find location:
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446 -r2d9ae14753290cda30c195c64423c93062fa8e17
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2d9ae14753290cda30c195c64423c93062fa8e17)
@@ -48,7 +48,8 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.centerMap"></fmt:message>
 			</div>
-			<input type="text" size="60" onkeypress="javascript:if (event.keyCode==13){showAddress(); return false;}" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+			
+			<html:text property="defaultGeocoderAddress" size="60" onkeypress="javascript:if (event.keyCode==13){showAddress(); return false;}"></html:text>
        		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 		</td>
 	</tr>
Index: lams_tool_gmap/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446 -r2d9ae14753290cda30c195c64423c93062fa8e17
--- lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
+++ lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 2d9ae14753290cda30c195c64423c93062fa8e17)
@@ -150,7 +150,7 @@
 			<br /><br />	
 			<table>
 			<tr><td>
-				<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress(); return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+				<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="${dto.defaultGeocoderAddress}" />
 				<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 			</td></tr>
 			</table>	
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
diff -u -r3813117828096a5d4063e220506bbc6357be2683 -r2d9ae14753290cda30c195c64423c93062fa8e17
--- lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 3813117828096a5d4063e220506bbc6357be2683)
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 2d9ae14753290cda30c195c64423c93062fa8e17)
@@ -49,7 +49,7 @@
 	</table>
 	<p />
 	
-	<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+	<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="${gmapDTO.defaultGeocoderAddress}" />
     			<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 	
 	
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rdc6283ec2ee6d71e510fdeffb3fd35ec32694446 -r2d9ae14753290cda30c195c64423c93062fa8e17
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision dc6283ec2ee6d71e510fdeffb3fd35ec32694446)
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2d9ae14753290cda30c195c64423c93062fa8e17)
@@ -242,8 +242,8 @@
 	
 	<table>
 	<tr><td>
-		<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress(); return false;}" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
-			<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
+		<input type="text" onkeypress="javascript:if (event.keyCode==13){showAddress();return false;}" size="60" name="address" id="address" value="${dto.defaultGeocoderAddress}" />			
+		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
 	</td></tr>
 	</table>
 	</div>