You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fm...@apache.org on 2011/07/27 16:51:12 UTC
svn commit: r1151487 - in /tuscany/sca-java-2.x/trunk/samples/learning-more:
binding-comet/autocomplete-webapp/
binding-comet/autocomplete-webapp/src/main/webapp/
binding-comet/autocomplete-webapp/src/main/webapp/jquery/
binding-comet/chat-webapp/ bind...
Author: fmoga
Date: Wed Jul 27 14:51:09 2011
New Revision: 1151487
URL: http://svn.apache.org/viewvc?rev=1151487&view=rev
Log:
Use Google CDN for jQuery. Other minor adjustments to samples.
Removed:
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/jquery/
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/jquery/
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/jquery/
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/jquery/
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/jquery/
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/jquery/
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/jquery/
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/jquery/
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/pom.xml Wed Jul 27 14:51:09 2011
@@ -68,7 +68,7 @@
<configuration>
<webapps>
<webappArtifact>
- <groupId>org.apache.tuscany.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>sample-binding-comet-autocomplete-webapp</artifactId>
<version>2.0-SNAPSHOT</version>
</webappArtifact>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/autocomplete-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -20,7 +20,7 @@
<head>
<title>Apache Tuscany Comet Sample</title>
<!-- Tuscany Comet Javascript Toolkit is dependent on jQuery -->
- <script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="tuscany-comet-js/org.apache.tuscany.sca.CometComponentContext.js"></script>
<script type="text/javascript">
var user = "";
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/pom.xml Wed Jul 27 14:51:09 2011
@@ -68,7 +68,7 @@
<configuration>
<webapps>
<webappArtifact>
- <groupId>org.apache.tuscany.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>sample-binding-comet-chat-webapp</artifactId>
<version>2.0-SNAPSHOT</version>
</webappArtifact>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/chat-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -20,7 +20,7 @@
<head>
<title>Apache Tuscany Comet Sample</title>
<!-- Tuscany Comet Javascript Toolkit is dependent on jQuery -->
- <script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="tuscany-comet-js/org.apache.tuscany.sca.CometComponentContext.js"></script>
<script type="text/javascript">
var user = "";
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/pom.xml Wed Jul 27 14:51:09 2011
@@ -68,7 +68,7 @@
<configuration>
<webapps>
<webappArtifact>
- <groupId>org.apache.tuscany.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>sample-binding-comet-pubsub-webapp</artifactId>
<version>2.0-SNAPSHOT</version>
</webappArtifact>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -18,45 +18,39 @@
-->
<html>
<head>
-<title>Apache Tuscany Comet Sample</title>
-<!-- Tuscany Comet Javascript Toolkit is dependent on jQuery -->
-<script type="text/javascript"
- src="jquery/jquery-1.4.2.min.js"></script>
-<script type="text/javascript"
- src="tuscany-comet-js/org.apache.tuscany.sca.CometComponentContext.js"></script>
-<script type="text/javascript">
+ <title>Apache Tuscany Comet Sample</title>
+ <!-- Tuscany Comet Javascript Toolkit is dependent on jQuery -->
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
+ <script type="text/javascript" src="tuscany-comet-js/org.apache.tuscany.sca.CometComponentContext.js"></script>
+ <script type="text/javascript">
$(document).ready(function()
{
- document.getElementById('registerEventButton').onclick = function(event) {
- document.getElementById('registerEventName').value;
- }
-
// Tuscany Comet specific API
- document.getElementById('connect').onclick = function(event) {
+ $('#connect').click(function(event) {
/* transport can be : long-polling or streaming */
- SCA.TuscanyComet.connect(document.getElementById('transport').value);
- document.getElementById('connect').value = 'Switch';
- }
+ SCA.TuscanyComet.connect($('#transport').val());
+ $('#connect').val('Switch');
+ });
- document.getElementById('registerEventButton').onclick = function(event) {
- var eventName = document.getElementById('registerEventName').value;
+ $('#registerEventButton').click(function(event) {
+ var eventName = $('#registerEventName').val();
if (registrationIds[eventName] != null) {
alert("Already registered for " + eventName + " events");
} else {
SCA.CometComponentContext.EventProcessorConsumerService.register(eventName, responseReceived);
}
- }
+ });
- document.getElementById('unregisterEventButton').onclick = function(event) {
- var eventName = document.getElementById('unregisterEventName').value;
+ $('#unregisterEventButton').click(function(event) {
+ var eventName = $('#unregisterEventName').val();
if (registrationIds[eventName] != null) {
SCA.CometComponentContext.EventProcessorConsumerService.unregister(registrationIds[eventName], responseReceived);
registrationIds[eventName] = null;
} else {
alert("Not registered for " + eventName + " events");
}
- }
+ });
});
@@ -72,12 +66,12 @@
// event notification
text = event.name + ": " + event.data;
}
- var textarea = document.getElementById('textarea');
- textarea.value += text + "\n";
- textarea.scrollTop = textarea.scrollHeight;
+ var textarea = $('#textarea');
+ $(textarea).val($(textarea).val() + text + "\n");
+ $(textarea).scrollTop($(textarea)[0].scrollHeight);
}
- </script>
+ </script>
</head>
<body>
<div id='sidebar'>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml Wed Jul 27 14:51:09 2011
@@ -61,7 +61,7 @@
<configuration>
<webapps>
<webappArtifact>
- <groupId>org.apache.tuscany.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>sample-binding-comet-weather-webapp</artifactId>
<version>2.0-SNAPSHOT</version>
</webappArtifact>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -20,7 +20,7 @@
<head>
<title>Apache Tuscany Comet Sample</title>
<!-- Tuscany Comet Javascript Toolkit is dependent on jQuery -->
- <script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="tuscany-comet-js/org.apache.tuscany.sca.CometComponentContext.js"></script>
<script type="text/javascript">
$(document).ready(function()
@@ -30,79 +30,78 @@
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 = '';
- }
+ $('#locationButton').attr('disabled', 'disabled');
+ $('#tempCButton').attr('disabled', 'disabled');
+ $('#tempFButton').attr('disabled', 'disabled');
+ $('#humButton').attr('disabled', 'disabled');
+ $('#precipButton').attr('disabled', 'disabled');
+
+ $('#locationButton').click(function(event) {
+ location.city = $('#city').val();
+ location.country = $('#country').val();
+ $('#locationButton').val('Switch location');
+ $('#tempCButton').removeAttr('disabled');
+ $('#tempFButton').removeAttr('disabled');
+ $('#humButton').removeAttr('disabled');
+ $('#precipButton').removeAttr('disabled');
+ $('#tempCText').text('N/A');
+ $('#tempCDate').text('');
+ $('#tempFText').text('N/A');
+ $('#tempFDate').text('');
+ $('#humText').text('N/A');
+ $('#humDate').text('');
+ $('#precipText').text('N/A');
+ $('#precipDate').textContent('');
+ });
// Tuscany Comet specific API
-
- document.getElementById('connect').onclick = function(event) {
+ $('#connect').click(function(event) {
/* transport can be : long-polling or streaming */
- SCA.TuscanyComet.connect(document.getElementById('transport').value);
- document.getElementById('connect').value = 'Switch';
- document.getElementById('locationButton').disabled = false;
- }
+ SCA.TuscanyComet.connect($('#transport').val());
+ $('#connect').val('Switch');
+ $('#locationButton').removeAttr('disabled');
+ });
- document.getElementById('tempCButton').onclick = function(event) {
+ $('#tempCButton').click(function(event) {
SCA.CometComponentContext.TemperatureService.getTemperature(location, 1, updateTempC);
- document.getElementById('tempCButton').disabled = true;
- }
+ $('#tempCButton').removeAttr('disabled');
+ });
- document.getElementById('tempFButton').onclick = function(event) {
+ $('#tempFButton').click(function(event) {
SCA.CometComponentContext.TemperatureService.getTemperature(location, 2, updateTempF);
- document.getElementById('tempFButton').disabled = true;
- }
+ $('#tempFButton').removeAttr('disabled');
+ });
- document.getElementById('humButton').onclick = function(event) {
+ $('#humButton').click(function(event) {
SCA.CometComponentContext.HumidityService.getHumidity(location, updateHum);
- document.getElementById('humButton').disabled = true;
- }
+ $('#humButton').removeAttr('disabled');
+ });
- document.getElementById('precipButton').onclick = function(event) {
+ $('#precipButton').click(function(event) {
SCA.CometComponentContext.PrecipitationService.getPrecipitation(location, updatePrecip);
- document.getElementById('precipButton').disabled = true;
- }
+ $('#precipButton').removeAttr('disabled');
+ });
});
function updateTempC(response) {
- document.getElementById('tempCText').textContent = response.data;
- document.getElementById('tempCDate').textContent = response.date;
+ $('#tempCText').text(response.data);
+ $('#tempCDate').text(response.date);
}
function updateTempF(response) {
- document.getElementById('tempFText').textContent = response.data;
- document.getElementById('tempFDate').textContent = response.date;
+ $('#tempFText').text(response.data);
+ $('#tempFDate').text(response.date);
}
function updateHum(response) {
- document.getElementById('humText').textContent = response.data;
- document.getElementById('humDate').textContent = response.date;
+ $('#humText').text(response.data);
+ $('#humDate').text(response.date);
}
function updatePrecip(response) {
- document.getElementById('precipText').textContent = response.data;
- document.getElementById('precipDate').textContent = response.date;
+ $('#precipText').text(response.data);
+ $('#precipDate').text(response.date);
}
</script>
</head>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -19,7 +19,7 @@
<html>
<head>
<title>Apache Tuscany Websocket Sample</title>
- <script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
<script type="text/javascript">
var user = "";
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -19,7 +19,7 @@
<html>
<head>
<title>Apache Tuscany Websocket Sample</title>
- <script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
<script type="text/javascript">
var user = "";
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -19,7 +19,7 @@
<html>
<head>
<title>Apache Tuscany Websocket Sample</title>
- <script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
<script type="text/javascript">
var registrationIds = {};
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html?rev=1151487&r1=1151486&r2=1151487&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html Wed Jul 27 14:51:09 2011
@@ -19,7 +19,7 @@
<html>
<head>
<title>Apache Tuscany Websocket Sample</title>
- <script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
<script type="text/javascript">
$(document).ready(function(){
@@ -35,9 +35,9 @@
location.city = $('#city').val();
location.country = $('#country').val();
$('#locationButton').attr('disabled', 'disabled');
- $('#tempButton').attr('disabled', '');
- $('#humButton').attr('disabled', '');
- $('#precipButton').attr('disabled', '');
+ $('#tempButton').removeAttr('disabled');
+ $('#humButton').removeAttr('disabled');
+ $('#precipButton').removeAttr('disabled');
});
$('#tempButton').click(function(event) {