1 files changed, 62 insertions, 8 deletions

diff --git a/sca-java-2.x/contrib/samples/comet-webapp/src/main/webapp/index.html b/sca-java-2.x/contrib/samples/comet-webapp/src/main/webapp/index.html
index c96507eb02..94b3470e1a 100644
--- a/sca-java-2.x/contrib/samples/comet-webapp/src/main/webapp/index.html
+++ b/sca-java-2.x/contrib/samples/comet-webapp/src/main/webapp/index.html
@@ -23,49 +23,86 @@
 		<script type="text/javascript">
 		$(document).ready(function()
 		{
+			// Initialization
+			var location = new Object();
+			location.city = null;
+			location.country = null;
+
+			document.getElementById('locationButton').disabled = true;
+			document.getElementById('tempCButton').disabled = true;
+			document.getElementById('tempFButton').disabled = true;
+			document.getElementById('humButton').disabled = true;
+			document.getElementById('precipButton').disabled = true;
+
+			document.getElementById('locationButton').onclick = function(event) {
+				location.city = document.getElementById('city').value;
+				location.country = document.getElementById('country').value;
+				document.getElementById('locationButton').value = 'Switch location';
+				document.getElementById('tempCButton').disabled = false;
+				document.getElementById('tempFButton').disabled = false;
+				document.getElementById('humButton').disabled = false;
+				document.getElementById('precipButton').disabled = false;
+				document.getElementById('tempCText').textContent = 'N/A';
+				document.getElementById('tempCDate').textContent = '';
+				document.getElementById('tempFText').textContent = 'N/A';
+				document.getElementById('tempFDate').textContent = '';
+				document.getElementById('humText').textContent = 'N/A';
+				document.getElementById('humDate').textContent = '';
+				document.getElementById('precipText').textContent = 'N/A';
+				document.getElementById('precipDate').textContent = '';
+			}
+
+			// Tuscany Comet specific API
+			
 			document.getElementById('connect').onclick = function(event) {
                 /* transport can be : long-polling, streaming or websocket */
 			 	tuscanyComet.connect(document.getElementById('transport').value);
                 document.getElementById('connect').disabled = true;
                 document.getElementById('transport').disabled = true;
+                document.getElementById('locationButton').disabled = false;
 			}
 			
 
 			document.getElementById('tempCButton').onclick = function(event) {
-				cometComponentContext.c1.TemperatureService.getTemperatureCelsius(updateTempC);
+				cometComponentContext.TemperatureService.getTemperature(location, 1, updateTempC);
 			}
 
 			document.getElementById('tempFButton').onclick = function(event) {
-				cometComponentContext.c1.TemperatureService.getTemperatureFahrenheit(updateTempF);
+				cometComponentContext.TemperatureService.getTemperature(location, 2, updateTempF);
 			}
 
 			document.getElementById('humButton').onclick = function(event) {
-				cometComponentContext.c1.HumidityService.getHumidity(updateHum);
+				cometComponentContext.HumidityService.getHumidity(location, updateHum);
 			}
 
 			document.getElementById('precipButton').onclick = function(event) {
-				cometComponentContext.c2.PrecipitationService.getPrecipitation(updatePrecip);
+				cometComponentContext.PrecipitationService.getPrecipitation(location, updatePrecip);
 			}
 		});
 
 		function updateTempC(response) {
-			document.getElementById('tempCText').textContent = response;
+			document.getElementById('tempCText').textContent = response.data;
+			document.getElementById('tempCDate').textContent = response.date;
 		}
 
 		function updateTempF(response) {
-			document.getElementById('tempFText').textContent = response;
+			document.getElementById('tempFText').textContent = response.data;
+			document.getElementById('tempFDate').textContent = response.date;
 		}
 
 		function updateHum(response) {
-			document.getElementById('humText').textContent = response;
+			document.getElementById('humText').textContent = response.data;
+			document.getElementById('humDate').textContent = response.date;
 		}
 
 		function updatePrecip(response) {
-			document.getElementById('precipText').textContent = response;
+			document.getElementById('precipText').textContent = response.data;
+			document.getElementById('precipDate').textContent = response.date;
 		}
 		</script>
 	</head>
 	<body>
+		<div id='sidebar'>
 		<h2>Apache Tuscany Comet Sample</h2>
 		<label>Select transport</label>
     	<select id="transport">
@@ -78,25 +115,42 @@
 		<p/>
 		<table>
 			<tr>
+				<td>City</td>
+				<td><input type="text" id='city'/></td>
+			</tr>
+			<tr>
+				<td>Country</td>
+				<td><input type="text" id ='country'/></td>
+			</tr>
+		</table>
+		<input type="button" id='locationButton' value='Set location'/>
+		<p/>
+		<table>
+			<tr>
 				<th align="left">Temperature (Celsius):</th>
 				<td><span id='tempCText'>N/A</span></td>
 				<td><input type='button' id='tempCButton' value="Update"/></td>
+				<td><span id='tempCDate'></span>
 			</tr>
 			<tr>
 				<th align="left">Temperature (Fahrenheit):</th>
 				<td><span id='tempFText'>N/A</span></td>
 				<td><input type='button' id='tempFButton' value="Update"/></td>
+				<td><span id='tempFDate'></span>
 			</tr>
 			<tr>
 				<th align="left">Humidity:</th>
 				<td><span id='humText'>N/A</span></td>
 				<td><input type='button' id='humButton' value="Update"/></td>
+				<td><span id='humDate'></span>
 			</tr>
 			<tr>
 				<th align="left">Precipitation probability:</th>
 				<td><span id='precipText'>N/A</span></td>
 				<td><input type='button' id='precipButton' value="Update"/></td>
+				<td><span id='precipDate'></span>
 			</tr>
 		</table>
+		</div>
 	</body>
 </html>