[Xmpp4js-commit] SF.net SVN: xmpp4js:[747] xmpp4js-launcher
Status: Beta
Brought to you by:
h-iverson
Menu
▾
▴
[Xmpp4js-commit] SF.net SVN: xmpp4js:[747] xmpp4js-launcher
|
From: <h-i...@us...> - 2008-07-25 04:04:15
|
Revision: 747
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=747&view=rev
Author: h-iverson
Date: 2008-07-25 04:04:22 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
added pause/resume functionality
Modified Paths:
--------------
xmpp4js-launcher/pom.xml
xmpp4js-launcher/src/assembler/src.xml
xmpp4js-launcher/src/main/webapp/simpleclient.html
Added Paths:
-----------
xmpp4js-launcher/src/main/javascript/cookies.js
xmpp4js-launcher/src/main/javascript/json2.js
Modified: xmpp4js-launcher/pom.xml
===================================================================
--- xmpp4js-launcher/pom.xml 2008-07-25 03:18:15 UTC (rev 746)
+++ xmpp4js-launcher/pom.xml 2008-07-25 04:04:22 UTC (rev 747)
@@ -50,10 +50,15 @@
<executions>
<execution>
<goals>
+ <goal>compress</goal>
<goal>war-package</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <compressor>YahooUI</compressor>
+ <strip>;;;</strip>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: xmpp4js-launcher/src/assembler/src.xml
===================================================================
--- xmpp4js-launcher/src/assembler/src.xml 2008-07-25 03:18:15 UTC (rev 746)
+++ xmpp4js-launcher/src/assembler/src.xml 2008-07-25 04:04:22 UTC (rev 747)
@@ -3,6 +3,7 @@
<baseDirectory>xmpp4js-launcher</baseDirectory>
<formats>
<format>zip</format>
+ <format>dir</format>
</formats>
<dependencySets>
Added: xmpp4js-launcher/src/main/javascript/cookies.js
===================================================================
--- xmpp4js-launcher/src/main/javascript/cookies.js (rev 0)
+++ xmpp4js-launcher/src/main/javascript/cookies.js 2008-07-25 04:04:22 UTC (rev 747)
@@ -0,0 +1,83 @@
+//******************************************************************************************//
+// File for cookie related fnctions in JavaScript //
+// Author : Manish Hatwalne (http://www.technofundo.com/) //
+// Feedback : fee...@te... (for feedback/bugs) //
+// Created : 19 August 2001 //
+// Functions : //
+// (1) setCookie(szName, szValue [,szExpires] [,szPath] [,szDomain] [,szSecure]) //
+// (2) getCookie(szName) //
+// (3) deleteCookie(szName) //
+// //
+// Feel free to use/modify the code in this file, but always keep the header intact. //
+// And DO NOT re-distribute this file, instead provide a link to the site //
+// http://www.technofundo.com/. Thank You. //
+// //
+//******************************************************************************************//
+
+
+
+//******************************************************************************************
+//
+// A CGI program uses the following syntax to add cookie information to the HTTP header:
+//
+// Set-Cookie: name=value
+// [;EXPIRES=dateValue]
+// [;DOMAIN=domainName]
+// [;PATH=pathName]
+// [;SECURE]
+//
+// This function sets a client-side cookie as above. Only first 2 parameters are required
+// Rest of the parameters are optional. If no szExpires value is set, cookie is a session cookie.
+//
+// Prototype : setCookie(szName, szValue [,szExpires] [,szPath] [,szDomain] [,bSecure])
+//******************************************************************************************
+
+
+function setCookie(szName, szValue, szExpires, szPath, szDomain, bSecure)
+{
+ var szCookieText = escape(szName) + '=' + escape(szValue);
+ szCookieText += (szExpires ? '; EXPIRES=' + szExpires.toGMTString() : '');
+ szCookieText += (szPath ? '; PATH=' + szPath : '');
+ szCookieText += (szDomain ? '; DOMAIN=' + szDomain : '');
+ szCookieText += (bSecure ? '; SECURE' : '');
+
+ document.cookie = szCookieText;
+}
+
+//******************************************************************************************
+// This functions reads & returns the cookie value of the specified cookie (by cookie name)
+//
+// Prototype : getCookie(szName)
+//******************************************************************************************
+
+function getCookie(szName)
+{
+ var szValue = null;
+ if(document.cookie) //only if exists
+ {
+ var arr = document.cookie.split((escape(szName) + '='));
+ if(2 <= arr.length)
+ {
+ var arr2 = arr[1].split(';');
+ szValue = unescape(arr2[0]);
+ }
+ }
+ return szValue;
+}
+
+//******************************************************************************************
+// To delete a cookie, pass name of the cookie to be deleted
+//
+// Prototype : deleteCookie(szName)
+//******************************************************************************************
+
+function deleteCookie(szName)
+{
+ var tmp = getCookie(szName);
+ if(tmp)
+ { setCookie(szName,tmp,(new Date(1))); }
+}
+
+//==========================================^-^==============================================//
+// This and many more interesting and usefull scripts at http://www.technofundo.com/ //
+//==========================================^-^==============================================//
\ No newline at end of file
Added: xmpp4js-launcher/src/main/javascript/json2.js
===================================================================
--- xmpp4js-launcher/src/main/javascript/json2.js (rev 0)
+++ xmpp4js-launcher/src/main/javascript/json2.js 2008-07-25 04:04:22 UTC (rev 747)
@@ -0,0 +1,475 @@
+/*
+ http://www.JSON.org/json2.js
+ 2008-07-15
+
+ Public Domain.
+
+ NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+ See http://www.JSON.org/js.html
+
+ This file creates a global JSON object containing two methods: stringify
+ and parse.
+
+ JSON.stringify(value, replacer, space)
+ value any JavaScript value, usually an object or array.
+
+ replacer an optional parameter that determines how object
+ values are stringified for objects. It can be a
+ function or an array.
+
+ space an optional parameter that specifies the indentation
+ of nested structures. If it is omitted, the text will
+ be packed without extra whitespace. If it is a number,
+ it will specify the number of spaces to indent at each
+ level. If it is a string (such as '\t' or ' '),
+ it contains the characters used to indent at each level.
+
+ This method produces a JSON text from a JavaScript value.
+
+ When an object value is found, if the object contains a toJSON
+ method, its toJSON method will be called and the result will be
+ stringified. A toJSON method does not serialize: it returns the
+ value represented by the name/value pair that should be serialized,
+ or undefined if nothing should be serialized. The toJSON method
+ will be passed the key associated with the value, and this will be
+ bound to the object holding the key.
+
+ For example, this would serialize Dates as ISO strings.
+
+ Date.prototype.toJSON = function (key) {
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ return this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z';
+ };
+
+ You can provide an optional replacer method. It will be passed the
+ key and value of each member, with this bound to the containing
+ object. The value that is returned from your method will be
+ serialized. If your method returns undefined, then the member will
+ be excluded from the serialization.
+
+ If the replacer parameter is an array, then it will be used to
+ select the members to be serialized. It filters the results such
+ that only members with keys listed in the replacer array are
+ stringified.
+
+ Values that do not have JSON representations, such as undefined or
+ functions, will not be serialized. Such values in objects will be
+ dropped; in arrays they will be replaced with null. You can use
+ a replacer function to replace those with JSON values.
+ JSON.stringify(undefined) returns undefined.
+
+ The optional space parameter produces a stringification of the
+ value that is filled with line breaks and indentation to make it
+ easier to read.
+
+ If the space parameter is a non-empty string, then that string will
+ be used for indentation. If the space parameter is a number, then
+ the indentation will be that many spaces.
+
+ Example:
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}]);
+ // text is '["e",{"pluribus":"unum"}]'
+
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+ // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+ text = JSON.stringify([new Date()], function (key, value) {
+ return this[key] instanceof Date ?
+ 'Date(' + this[key] + ')' : value;
+ });
+ // text is '["Date(---current time---)"]'
+
+
+ JSON.parse(text, reviver)
+ This method parses a JSON text to produce an object or array.
+ It can throw a SyntaxError exception.
+
+ The optional reviver parameter is a function that can filter and
+ transform the results. It receives each of the keys and values,
+ and its return value is used instead of the original value.
+ If it returns what it received, then the structure is not modified.
+ If it returns undefined then the member is deleted.
+
+ Example:
+
+ // Parse the text. Values that look like ISO date strings will
+ // be converted to Date objects.
+
+ myData = JSON.parse(text, function (key, value) {
+ var a;
+ if (typeof value === 'string') {
+ a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+ if (a) {
+ return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+ +a[5], +a[6]));
+ }
+ }
+ return value;
+ });
+
+ myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+ var d;
+ if (typeof value === 'string' &&
+ value.slice(0, 5) === 'Date(' &&
+ value.slice(-1) === ')') {
+ d = new Date(value.slice(5, -1));
+ if (d) {
+ return d;
+ }
+ }
+ return value;
+ });
+
+
+ This is a reference implementation. You are free to copy, modify, or
+ redistribute.
+
+ This code should be minified before deployment.
+ See http://javascript.crockford.com/jsmin.html
+
+ USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+ NOT CONTROL.
+*/
+
+/*jslint evil: true */
+
+/*global JSON */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", call,
+ charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, getUTCMinutes,
+ getUTCMonth, getUTCSeconds, hasOwnProperty, join, lastIndex, length,
+ parse, propertyIsEnumerable, prototype, push, replace, slice, stringify,
+ test, toJSON, toString
+*/
+
+if (!this.JSON) {
+
+// Create a JSON object only if one does not already exist. We create the
+// object in a closure to avoid creating global variables.
+
+ JSON = function () {
+
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ Date.prototype.toJSON = function (key) {
+
+ return this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z';
+ };
+
+ String.prototype.toJSON =
+ Number.prototype.toJSON =
+ Boolean.prototype.toJSON = function (key) {
+ return this.valueOf();
+ };
+
+ var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ escapeable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ gap,
+ indent,
+ meta = { // table of character substitutions
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '\\': '\\\\'
+ },
+ rep;
+
+
+ function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+ escapeable.lastIndex = 0;
+ return escapeable.test(string) ?
+ '"' + string.replace(escapeable, function (a) {
+ var c = meta[a];
+ if (typeof c === 'string') {
+ return c;
+ }
+ return '\\u' + ('0000' +
+ (+(a.charCodeAt(0))).toString(16)).slice(-4);
+ }) + '"' :
+ '"' + string + '"';
+ }
+
+
+ function str(key, holder) {
+
+// Produce a string from holder[key].
+
+ var i, // The loop counter.
+ k, // The member key.
+ v, // The member value.
+ length,
+ mind = gap,
+ partial,
+ value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+ if (value && typeof value === 'object' &&
+ typeof value.toJSON === 'function') {
+ value = value.toJSON(key);
+ }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+ if (typeof rep === 'function') {
+ value = rep.call(holder, key, value);
+ }
+
+// What happens next depends on the value's type.
+
+ switch (typeof value) {
+ case 'string':
+ return quote(value);
+
+ case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+ return isFinite(value) ? String(value) : 'null';
+
+ case 'boolean':
+ case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+ return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+ case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+ if (!value) {
+ return 'null';
+ }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+ gap += indent;
+ partial = [];
+
+// If the object has a dontEnum length property, we'll treat it as an array.
+
+ if (typeof value.length === 'number' &&
+ !(value.propertyIsEnumerable('length'))) {
+
+// The object is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+ length = value.length;
+ for (i = 0; i < length; i += 1) {
+ partial[i] = str(i, value) || 'null';
+ }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+ v = partial.length === 0 ? '[]' :
+ gap ? '[\n' + gap +
+ partial.join(',\n' + gap) + '\n' +
+ mind + ']' :
+ '[' + partial.join(',') + ']';
+ gap = mind;
+ return v;
+ }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+ if (rep && typeof rep === 'object') {
+ length = rep.length;
+ for (i = 0; i < length; i += 1) {
+ k = rep[i];
+ if (typeof k === 'string') {
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+ for (k in value) {
+ if (Object.hasOwnProperty.call(value, k)) {
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+ v = partial.length === 0 ? '{}' :
+ gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
+ mind + '}' : '{' + partial.join(',') + '}';
+ gap = mind;
+ return v;
+ }
+ }
+
+// Return the JSON object containing the stringify and parse methods.
+
+ return {
+ stringify: function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+ var i;
+ gap = '';
+ indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+ if (typeof space === 'number') {
+ for (i = 0; i < space; i += 1) {
+ indent += ' ';
+ }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+ } else if (typeof space === 'string') {
+ indent = space;
+ }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+ rep = replacer;
+ if (replacer && typeof replacer !== 'function' &&
+ (typeof replacer !== 'object' ||
+ typeof replacer.length !== 'number')) {
+ throw new Error('JSON.stringify');
+ }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+ return str('', {'': value});
+ },
+
+
+ parse: function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+ var j;
+
+ function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+ var k, v, value = holder[key];
+ if (value && typeof value === 'object') {
+ for (k in value) {
+ if (Object.hasOwnProperty.call(value, k)) {
+ v = walk(value, k);
+ if (v !== undefined) {
+ value[k] = v;
+ } else {
+ delete value[k];
+ }
+ }
+ }
+ }
+ return reviver.call(holder, key, value);
+ }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+ cx.lastIndex = 0;
+ if (cx.test(text)) {
+ text = text.replace(cx, function (a) {
+ return '\\u' + ('0000' +
+ (+(a.charCodeAt(0))).toString(16)).slice(-4);
+ });
+ }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+ if (/^[\],:{}\s]*$/.
+test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+ j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+ return typeof reviver === 'function' ?
+ walk({'': j}, '') : j;
+ }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+ throw new SyntaxError('JSON.parse');
+ }
+ };
+ }();
+}
Modified: xmpp4js-launcher/src/main/webapp/simpleclient.html
===================================================================
--- xmpp4js-launcher/src/main/webapp/simpleclient.html 2008-07-25 03:18:15 UTC (rev 746)
+++ xmpp4js-launcher/src/main/webapp/simpleclient.html 2008-07-25 04:04:22 UTC (rev 747)
@@ -5,6 +5,8 @@
<script type="text/javascript" src="scripts/lib/dom-all.js"></script>
<script type="text/javascript" src="scripts/lib/crypto.js"></script>
<script type="text/javascript" src="scripts/lib/xmpp4js.js"></script>
+ <script type="text/javascript" src="scripts/json2.js"></script>
+ <script type="text/javascript" src="scripts/cookies.js"></script>
</head>
<body>
@@ -140,20 +142,19 @@
*
* @private
*/
- init: function() {
+ init: function(isResume) {
var stanzaProvider = new Xmpp4Js.Packet.StanzaProvider();
stanzaProvider.registerDefaultProviders();
var transportClasses = {bosh: Xmpp4Js.Transport.BOSH, script: Xmpp4Js.Transport.Script};
- var endpoint = this.loginForm.endpoint.value;
-
- this.con = new Xmpp4Js.Connection({
+ var connectionConfig = {
+ // FIXME none of this transport stuff should be needed if we plan to resume.
transport: {
useKeys: true,
- clazz: transportClasses[ this.loginForm.transport.value ],
- endpoint: endpoint // where your BOSH server is running.
+ clazz: !isResume ? transportClasses[ this.loginForm.transport.value ] : transportClasses.script ,
+ endpoint: !isResume ? this.loginForm.endpoint.value : "" // where your BOSH server is running.
// NOTE: same origin policy means you need some sort of proxt, or a servlet.
},
stanzaProvider: stanzaProvider,
@@ -162,7 +163,9 @@
error : this.onError,
close : this.onClose
}
- });
+ }
+
+ this.con = new Xmpp4Js.Connection(connectionConfig);
this.chatManager = Xmpp4Js.Chat.ChatManager.getInstanceFor( this.con );
this.chatManager.setOptions(this.CHAT_OPTIONS);
@@ -175,6 +178,36 @@
},
/**
+ * Pause the session and save it to a cookie when the page is unloaded
+ * if we are connected.
+ */
+ onPageUnload: function() {
+ if( this.con != null && this.con.isConnected() ) {
+ // pause for up to 120 seconds
+ var pauseStruct = this.con.pause( 120 );
+ setCookie( "pauseStruct", JSON.stringify(pauseStruct) );
+ }
+ },
+
+ /**
+ * Resume the sesion if there is one persisted.
+ * TODO error checking if more than 120 seconds have gone by
+ */
+ onPageLoad: function() {
+ var pauseStruct = getCookie( "pauseStruct" );
+ if( pauseStruct ) {
+ pauseStruct = JSON.parse(pauseStruct);
+
+ this.init( true );
+
+ this.con.resume( pauseStruct );
+
+ this.logMessage("Resumed session.");
+ this.onLoginCompleted();
+ }
+ },
+
+ /**
* This is called when we connect. It performs a login.
* @private
*/
@@ -269,10 +302,15 @@
var client = null;
window.onload = function() {
client = new SimpleClient();
+ client.onPageLoad();
client.logMessage( "Client ready." );
};
+window.onunload = function() {
+ client.onPageUnload();
+}
+
-->
</script>
<style type="text/css">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
