RubyGems - appcelerator - Versions diffs - 2.0.1.1 → 2.0.2 - Mend

appcelerator 2.0.1.1 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (147) hide show

data/appcelerator/templates/appcelerator.xml CHANGED

@@ -4,5 +4,6 @@
 	<servicebroker poll="false">@{rootPath}servicebroker</servicebroker>
 	<upload>@{rootPath}upload</upload>
 	<download>@{rootPath}download</download>
+	<proxy>@{rootPath}proxy</proxy>
 	<sessionid>SESSIONID</sessionid>
 </appcelerator>

data/appcelerator/templates/application.rb CHANGED

@@ -2,6 +2,5 @@
 # Likewise, all the methods added will be available for all controllers.
 class ApplicationController < ActionController::Base
-  # Pick a unique cookie name to distinguish our session data from others'
-  session :session_key => 'app_session_id'
+  helper :all # include all helpers, all the time
 end

data/appcelerator/templates/index.html CHANGED

@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
     <noscript><meta http-equiv="refresh" content="0;upgrade_script.html"/></noscript>
     <title>Congratulations. Appcelerator is installed.</title>
-    <script src="js/appcelerator.js" type="text/javascript"></script>
+    <script src="javascripts/appcelerator.js" type="text/javascript"></script>
     <link rel="shortcut icon" href="images/favicon.ico"/>
 </head>
 <body style="visibility:hidden" on="l:app.compiled then visible">

data/appcelerator/templates/{js → javascripts}/appcelerator-debug.js RENAMED

@@ -19,8 +19,7 @@
  */
 /* The following files are subject to license agreements by their respective license owners */
-/**
+		/**
  * this file is included *before* any other thirdparty libraries or
  * SDK files.  you must assume that you have no external capabilities in this file
  */
@@ -6365,10 +6364,223 @@ Element.findChildren = function(element, only, recursive, tagName) {
 Element.offsetSize = function (element, type) {
   return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
 }
+// Copyright (c) 2005 Thomas Fakes (http://craz8.com)
+//
+// This code is substantially based on code from script.aculo.us which has the
+// following copyright and permission notice
+//
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+var Resizeable = Class.create();
+Resizeable.prototype = {
+  initialize: function(element) {
+    var options = Object.extend({
+      top: 6,
+      bottom: 6,
+      left: 6,
+      right: 6,
+      minHeight: 0,
+      minWidth: 0,
+      zindex: 1000,
+      resize: null
+    }, arguments[1] || {});
+    this.element      = $(element);
+    this.handle 	  = this.element;
+    Element.makePositioned(this.element); // fix IE
+    this.options      = options;
+    this.active       = false;
+    this.resizing     = false;
+    this.currentDirection = '';
+    this.eventMouseDown = this.startResize.bindAsEventListener(this);
+    this.eventMouseUp   = this.endResize.bindAsEventListener(this);
+    this.eventMouseMove = this.update.bindAsEventListener(this);
+    this.eventCursorCheck = this.cursor.bindAsEventListener(this);
+    this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+    this.registerEvents();
+  },
+  destroy: function() {
+    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
+    this.unregisterEvents();
+  },
+  registerEvents: function() {
+    Event.observe(document, "mouseup", this.eventMouseUp);
+    Event.observe(document, "mousemove", this.eventMouseMove);
+    Event.observe(document, "keypress", this.eventKeypress);
+    Event.observe(this.handle, "mousedown", this.eventMouseDown);
+    Event.observe(this.element, "mousemove", this.eventCursorCheck);
+  },
+  unregisterEvents: function() {
+    //if(!this.active) return;
+    //Event.stopObserving(document, "mouseup", this.eventMouseUp);
+    //Event.stopObserving(document, "mousemove", this.eventMouseMove);
+    //Event.stopObserving(document, "mousemove", this.eventCursorCheck);
+    //Event.stopObserving(document, "keypress", this.eventKeypress);
+  },
+  startResize: function(event) {
+    if(Event.isLeftClick(event)) {
+      // abort on form elements, fixes a Firefox issue
+      var src = Event.element(event);
+      if(src.tagName && (
+        src.tagName=='INPUT' ||
+        src.tagName=='SELECT' ||
+        src.tagName=='BUTTON' ||
+        src.tagName=='TEXTAREA')) return;
+	  var dir = this.directions(event);
+	  if (dir.length > 0) {
+	      this.active = true;
+    	  var offsets = Position.cumulativeOffset(this.element);
+	      this.startTop = offsets[1];
+	      this.startLeft = offsets[0];
+	      this.startWidth = parseInt(Element.getStyle(this.element, 'width'));
+	      this.startHeight = parseInt(Element.getStyle(this.element, 'height'));
+	      this.startX = event.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
+	      this.startY = event.clientY + document.body.scrollTop + document.documentElement.scrollTop;
+	      this.currentDirection = dir;
+	      Event.stop(event);
+	  }
+    }
+  },
+  finishResize: function(event, success) {
+    // this.unregisterEvents();
+    this.active = false;
+    this.resizing = false;
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
+    if (this.options.resize) {
+    	this.options.resize(this.element);
+    }
+  },
+  keyPress: function(event) {
+    if(this.active) {
+      if(event.keyCode==Event.KEY_ESC) {
+        this.finishResize(event, false);
+        Event.stop(event);
+      }
+    }
+  },
+  endResize: function(event) {
+    if(this.active && this.resizing) {
+      this.finishResize(event, true);
+      Event.stop(event);
+    }
+    this.active = false;
+    this.resizing = false;
+  },
+  draw: function(event) {
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    var style = this.element.style;
+    if (this.currentDirection.indexOf('n') != -1) {
+    	var pointerMoved = this.startY - pointer[1];
+    	var margin = Element.getStyle(this.element, 'margin-top') || "0";
+    	var newHeight = this.startHeight + pointerMoved;
+    	if (newHeight > this.options.minHeight) {
+    		style.height = newHeight + "px";
+    		style.top = (this.startTop - pointerMoved - parseInt(margin)) + "px";
+    	}
+    }
+    if (this.currentDirection.indexOf('w') != -1) {
+    	var pointerMoved = this.startX - pointer[0];
+    	var margin = Element.getStyle(this.element, 'margin-left') || "0";
+    	var newWidth = this.startWidth + pointerMoved;
+    	if (newWidth > this.options.minWidth) {
+    		style.left = (this.startLeft - pointerMoved - parseInt(margin))  + "px";
+    		style.width = newWidth + "px";
+    	}
+    }
+    if (this.currentDirection.indexOf('s') != -1) {
+    	var newHeight = this.startHeight + pointer[1] - this.startY;
+    	if (newHeight > this.options.minHeight) {
+    		style.height = newHeight + "px";
+    	}
+    }
+    if (this.currentDirection.indexOf('e') != -1) {
+    	var newWidth = this.startWidth + pointer[0] - this.startX;
+    	if (newWidth > this.options.minWidth) {
+    		style.width = newWidth + "px";
+    	}
+    }
+    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+  between: function(val, low, high) {
+  	return (val >= low && val < high);
+  },
+  directions: function(event) {
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    var offsets = Position.cumulativeOffset(this.element);
+	var cursor = '';
+	if (this.between(pointer[1] - offsets[1], 0, this.options.top)) cursor += 'n';
+	if (this.between((offsets[1] + this.element.offsetHeight) - pointer[1], 0, this.options.bottom)) cursor += 's';
+	if (this.between(pointer[0] - offsets[0], 0, this.options.left)) cursor += 'w';
+	if (this.between((offsets[0] + this.element.offsetWidth) - pointer[0], 0, this.options.right)) cursor += 'e';
+	return cursor;
+  },
+  cursor: function(event) {
+  	var cursor = this.directions(event);
+	if (cursor.length > 0) {
+		cursor += '-resize';
+	} else {
+		cursor = '';
+	}
+	this.element.style.cursor = cursor;
+  },
+  update: function(event) {
+   if(this.active) {
+      if(!this.resizing) {
+        var style = this.element.style;
+        this.resizing = true;
+        if(Element.getStyle(this.element,'position')=='')
+          style.position = "relative";
+        if(this.options.zindex) {
+          this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+          style.zIndex = this.options.zindex;
+        }
+      }
+      this.draw(event);
+      // fix AppleWebKit rendering
+      if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+      Event.stop(event);
+      return false;
+   }
+  }
+}
 /* END THIRD PARTY SOURCE */
 /**
  * Appcelerator bootstrap loader
  */
@@ -6388,7 +6600,7 @@ Appcelerator.Version =
 {
 	major: parseInt('2'),
 	minor: parseInt('0'),
-	revision: parseInt('1.1'),
+	revision: parseInt('2'),
 	toString:function()
 	{
 		return this.major + "." + this.minor + '.' + this.revision;
@@ -6680,7 +6892,7 @@ Appcelerator.Core.loadJS = function (path, onload)
 		$E('Error loading '+path+'\n Exception: '+Object.getExceptionDetail(e));
 	};
-	Appcelerator.Core.HeadElement.appendChild(script);
+	Appcelerator.Core.HeadElement.appendChild(script);
 };
 Appcelerator.Core.widgets = {};
@@ -7187,6 +7399,21 @@ function $E()
     }
 }
+if(typeof err == 'undefined') {
+    var err = {
+        println: function(msg) {
+            console.log(msg); // TODO: switch to Logger
+        }
+    };
+}
+if(typeof out == 'undefined') {
+    var out = {
+        println: function(msg) {
+            console.log(msg); // TODO: switch to Logger
+        }
+    };
+}
 Object.extend(String.prototype,
 {
 	/**
@@ -8221,6 +8448,8 @@ Appcelerator.Compiler.isCompiledMode = false;
 Appcelerator.Compiler.compiledCode = '';
 Appcelerator.Compiler.compiledDocument = null;
 Appcelerator.Compiler.compiledJS = null;
+// list of strings of code that forwards to attribute listeners handlers (in compiled mode)
+Appcelerator.Compiler.compiledAttributeListeners = [];
 //
 // delay before showing loading message in number of milliseconds
@@ -8333,16 +8562,26 @@ Appcelerator.Compiler.registerAttributeProcessor = function(name,attribute,liste
 	}
 };
-Appcelerator.Compiler.forwardToAttributeListener = function(element,array)
+Appcelerator.Compiler.forwardToAttributeListener = function(element,array,tagname)
 {
-	for (var c=0;c<array.length;c++)
+    for (var i=0;i<array.length;i++)
 	{
-		var entry = array[c];
-		var attribute = entry[0];
+		var entry = array[i];
+		var attributeName = entry[0];
 		var listener = entry[1];
-		var value = element.getAttribute(attribute);
-		listener.handle(element,attribute,value);
-	}
+		var value = element.getAttribute(attributeName);
+        if (value) // optimization to avoid adding listeners if the attribute isn't present
+        {
+            if (Appcelerator.Compiler.isCompiledMode)
+            {
+                Appcelerator.Compiler.compiledAttributeListeners.push([element.id,attributeName,tagname,i]);
+            }
+            else
+            {
+                listener.handle(element,attributeName,value);
+            }
+        }
+    }
 };
 //
@@ -8355,16 +8594,12 @@ Appcelerator.Compiler.delegateToAttributeListeners = function(element)
 	var p = Appcelerator.Compiler.attributeProcessors[tagname];
 	if (p && p.length > 0)
 	{
-		Appcelerator.Compiler.forwardToAttributeListener(element,p);
+		Appcelerator.Compiler.forwardToAttributeListener(element,p,tagname);
 	}
 	p = Appcelerator.Compiler.attributeProcessors['*'];
 	if (p && p.length > 0)
 	{
-		Appcelerator.Compiler.forwardToAttributeListener(element,p);
-	}
-	if (Appcelerator.Compiler.isCompiledMode)
-	{
-		element.removeAttribute('on');
+		Appcelerator.Compiler.forwardToAttributeListener(element,p,'*');
 	}
 };
@@ -8462,7 +8697,7 @@ Appcelerator.Compiler.compileDocument = function(onFinishCompiled)
        }
        delete Appcelerator.Compiler.onbeforecompileListeners;
     }
     var container = document.body;
     var originalVisibility = container.style.visibility || 'visible';
@@ -8477,7 +8712,7 @@ Appcelerator.Compiler.compileDocument = function(onFinishCompiled)
     }
     var state = Appcelerator.Compiler.createCompilerState();
     // start scanning at the body
     Appcelerator.Compiler.compileElement(container,state);
@@ -8487,25 +8722,30 @@ Appcelerator.Compiler.compileDocument = function(onFinishCompiled)
     {
         setTimeout(function()
         {
-            if (Appcelerator.Compiler.oncompileListeners)
-            {
-                for (var c=0;c<Appcelerator.Compiler.oncompileListeners.length;c++)
-                {
-                    Appcelerator.Compiler.oncompileListeners[c]();
-                }
-                delete Appcelerator.Compiler.oncompileListeners;
-            }
-            if (typeof(onFinishCompiled)=='function') onFinishCompiled();
-            if (originalVisibility!=container.style.visibility)
-            {
-               container.style.visibility = originalVisibility;
-            }
-            $MQ('l:app.compiled');
+		    if (typeof(onFinishCompiled)=='function') onFinishCompiled();
+		    if (originalVisibility!=container.style.visibility)
+		    {
+		       container.style.visibility = originalVisibility;
+		    }
+			Appcelerator.Compiler.compileDocumentOnFinish();
         },0);
     };
     Appcelerator.Compiler.checkLoadState(state);
 };
+Appcelerator.Compiler.compileDocumentOnFinish = function ()
+{
+    if (Appcelerator.Compiler.oncompileListeners)
+    {
+        for (var c=0;c<Appcelerator.Compiler.oncompileListeners.length;c++)
+        {
+            Appcelerator.Compiler.oncompileListeners[c]();
+        }
+        delete Appcelerator.Compiler.oncompileListeners;
+    }
+    $MQ('l:app.compiled');
+}
 Appcelerator.Compiler.compileInterceptors=[];
 Appcelerator.Compiler.addCompilationInterceptor = function(interceptor)
@@ -8566,7 +8806,13 @@ Appcelerator.Compiler.compileElement = function(element,state)
 		element.style.originalDisplay = element.style.display || 'block';
 		if (Appcelerator.Compiler.isCompiledMode)
 		{
-			Appcelerator.Compiler.compileWidget(element,state);
+			var widgetJS = Appcelerator.Compiler.compileWidget(element,state);
+			var code = '(function()';
+			code += '{';
+			code += 'Appcelerator.Core.require("'+name+'",function()'
+			code += '{' + widgetJS + '});';
+			code += '})();';
+			Appcelerator.Compiler.compiledCode += code;
 		}
 		else
 		{
@@ -8661,6 +8907,16 @@ Appcelerator.Compiler.addTrash = function(element,trash)
 	element.trashcan.push(trash);
 };
+Appcelerator.Compiler.getJsonTemplateVar = function(values,var_name,template_var) {
+	var o = Object.getNestedProperty(values,var_name,template_var);
+	if (typeof(o) == 'object')
+	{
+		o = Object.toJSON(o);
+		o = o.replace(/"/g,'&quot;');
+	}
+	return o;
+}
 Appcelerator.Compiler.templateRE = /#\{(.*?)\}/g;
 Appcelerator.Compiler.compileTemplate = function(html,htmlonly,varname)
 {
@@ -8668,11 +8924,11 @@ Appcelerator.Compiler.compileTemplate = function(html,htmlonly,varname)
 	var fn = function(m, name, format, args)
 	{
-		return "'; o = Object.getNestedProperty(values,'"+name+"','#{"+name+"}'); o = (typeof(o)=='object') ? o.toJSON() : o; str+=o; str+='";
+		return "', jtv(values,'"+name+"','#{"+name+"}'),'";
 	};
-	var body = "var "+varname+" = function(values){ var o; var str = '" +
+	var body = "var "+varname+" = function(values){ var jtv = Appcelerator.Compiler.getJsonTemplateVar; return ['" +
             html.replace(/(\r\n|\n)/g, '').replace(/\t/g,' ').replace(/'/g, "\\'").replace(Appcelerator.Compiler.templateRE, fn) +
-            "'; return str; };" + (htmlonly?'':varname);
+            "'].join('');};" + (htmlonly?'':varname);
 	var result = htmlonly ? body : eval(body);
 	return result;
@@ -8788,6 +9044,11 @@ Appcelerator.Compiler.getHtml = function (element,convertHtmlPrefix)
 	var html = element.innerHTML || Appcelerator.Util.Dom.getText(element);
+	return Appcelerator.Compiler.convertHtml(html, convertHtmlPrefix);
+};
+Appcelerator.Compiler.convertHtml = function (html, convertHtmlPrefix)
+{
 	// convert funky url-encoded parameters escaped
 	if (html.indexOf('#%7B')!=-1)
 	{
@@ -9027,6 +9288,7 @@ Appcelerator.Compiler.compileWidget = function(element,state)
 {
 	var name = Appcelerator.Compiler.getTagname(element);
 	var module = Appcelerator.Core.widgets[name];
+	var compiledCode = '';
 	if (module)
 	{
@@ -9078,10 +9340,36 @@ Appcelerator.Compiler.compileWidget = function(element,state)
 		}
 		widgetParameters['id'] = id;
+		//
+		// building custom functions
+		//
+		var functions = null;
+		if (module.getActions)
+		{
+			functions = module.getActions();
+			for (var c=0;c<functions.length;c++)
+			{
+				Appcelerator.Compiler.buildCustomAction(functions[c]);
+			}
+		}
 		//
 		// parse on attribute
 		//
-		Appcelerator.Compiler.parseOnAttribute(element);
+		if (!Appcelerator.Compiler.isCompiledMode)
+		{
+			if (module.dontParseOnAttributes)
+			{
+				if (!module.dontParseOnAttributes())
+				{
+					Appcelerator.Compiler.parseOnAttribute(element);
+				}
+			}
+			else
+			{
+				Appcelerator.Compiler.parseOnAttribute(element);
+			}
+		}
 		//
 		// hande off widget for building
@@ -9125,6 +9413,11 @@ Appcelerator.Compiler.compileWidget = function(element,state)
 					//TODO: look to see how we can deal with this without adding DIV so we
 					//can support things like TR inside an iterator
 					html = '<div id="'+id+'_temp" style="margin:0;padding:0;display:none">'+html+'</div>';
+					if (Appcelerator.Browser.isIE)
+					{
+						html = '<?xml:namespace prefix = app ns = "http://www.appcelerator.org" /> ' + html;
+					}
 					added = true;
 					switch(position)
 					{
@@ -9193,8 +9486,17 @@ Appcelerator.Compiler.compileWidget = function(element,state)
 			//
 			// remove element
 			//
+			var removeId = id;
 			if (removeElement)
 			{
+				if (Appcelerator.Compiler.isCompiledMode)
+				{
+					// add an empty div to handle attribute processors
+					removeId = Appcelerator.Compiler.generateId();
+					var replaceHtml = '<div id="'+removeId+'" '+Appcelerator.Util.Dom.getAttributesString(element,['style','id'])+' style="margin:0;padding:0;display:none"/>';
+					new Insertion.Before(element,replaceHtml);
+					compiledCode += 'Appcelerator.Compiler.parseOnAttribute($("'+removeId+'"));';
+				}
 				Appcelerator.Compiler.removeElementId(id);
 				Element.remove(element);
 			}
@@ -9207,39 +9509,82 @@ Appcelerator.Compiler.compileWidget = function(element,state)
 			//
 			// attach any special widget functions
-			//
-			var functions = instructions.functions;
+			//
 			if (functions)
 			{
 				for (var c=0;c<functions.length;c++)
 				{
-					var name = functions[c];
-					var method = module[name];
-					if (!method) throw "couldn't find method named: "+name+" for module = "+module;
-					var f = function(id,m,data,scope)
+					var methodname = functions[c];
+					var method = module[methodname];
+					if (!method) throw "couldn't find method named: "+methodname+" for module = "+module;
+					if (Appcelerator.Compiler.isCompiledMode)
 					{
-						try
-						{
-							method(id,widgetParameters,data,scope);
-						}
-						catch (e)
+						var paramsJSON = Object.toJSON(widgetParameters).gsub('\\\\\\\"','\\\\\\\"').gsub('\\\'','\\\'');
+						compiledCode += '(function(){ var f = function(id,m,data,scope)';
+						compiledCode += '{';
+						compiledCode += 'try';
+						compiledCode += '{';
+						compiledCode += 'var module = Appcelerator.Core.widgets["'+name+'"];';
+						compiledCode += 'var method = module["'+methodname+'"];';
+						compiledCode += 'method("'+id+'",\''+paramsJSON+'\'.evalJSON(),data,scope);';
+						compiledCode += '}';
+						compiledCode += 'catch (e) {';
+						compiledCode += '$E("Error executing '+methodname+' in module '+module.toString()+'. Error "+Object.getExceptionDetail(e)+", stack="+e.stack);';
+						compiledCode += '}';
+						compiledCode += '};';
+						compiledCode += 'Appcelerator.Compiler.attachFunction("'+removeId+'","'+methodname+'",f);})();';
+					}
+					else
+					{
+						(function()
 						{
-							$E('Error executing '+name+' in module '+module.toString()+'. Error '+Object.getExceptionDetail(e)+', stack='+e.stack);
-						}
-					};
-					Appcelerator.Compiler.attachFunction(id,name,f);
+							var attachMethodName = functions[c];
+							var attachMethod = module[methodname];
+							var f = function(id,m,data,scope)
+							{
+								try
+								{
+									attachMethod(id,widgetParameters,data,scope);
+								}
+								catch (e)
+								{
+									$E('Error executing '+attachMethodName+' in module '+module.toString()+'. Error '+Object.getExceptionDetail(e)+', stack='+e.stack);
+								}
+							};
+							Appcelerator.Compiler.attachFunction(id,attachMethodName,f);
+						})();
+					}
 				}
 			}
-			// run the rest of the compiler for the widget
-			// after re-queuing so that we can prevent the UI thread from freezing
-			//setTimeout(function()
-		//	{
-	            //
-	            // run initialization
-	            //
-	            if (instructions.compile)
-	            {
+            //
+            // run initialization
+            //
+            if (instructions.compile)
+            {
+				if (Appcelerator.Compiler.isCompiledMode)
+				{
+					var paramsJSON = Object.toJSON(widgetParameters).gsub('\\\\\\\"','\\\\\\\"').gsub('\\\'','\\\'');
+					compiledCode += '(function(){try';
+					compiledCode += '{';
+					compiledCode += 'var module = Appcelerator.Core.widgets["'+name+'"];';
+					if (outer)
+					{
+						compiledCode += 'module.compileWidget(\''+paramsJSON+'\'.evalJSON(),$("'+outer.id+'"));';
+					}
+					else
+					{
+						compiledCode += 'module.compileWidget(\''+paramsJSON+'\'.evalJSON(),null);';
+					}
+					compiledCode += '}';
+					compiledCode += 'catch (exxx) {';
+					compiledCode += 'Appcelerator.Compiler.handleElementException($("'+id+'"), exxx, "compiling widget '+id+', type '+element.nodeName+'");';
+					compiledCode += 'return;';
+					compiledCode += '}})();';
+				}
+				else
+				{
 					try
 					{
 						module.compileWidget(widgetParameters,outer);
@@ -9249,22 +9594,36 @@ Appcelerator.Compiler.compileWidget = function(element,state)
 						Appcelerator.Compiler.handleElementException($(id), exxx, 'compiling widget ' + id + ', type ' + element.nodeName);
 						return;
 					}
-	            }
-	            if (added && instructions.wire && outer)
-	            {
-	                Appcelerator.Compiler.compileElement(outer, state);
-	            }
-	            // fix any issues from the new HTML (only matters in IE6 otherwise no-op)
-	            Appcelerator.Browser.fixImageIssues();
-	            // reset the display for the widget
-				if (outer)
+				}
+            }
+            if (added && instructions.wire && outer)
+            {
+				if (Appcelerator.Compiler.isCompiledMode)
+				{
+					compiledCode += 'Appcelerator.Compiler.dynamicCompile($("'+outer+'"));'; // is dynamic ok?
+				}
+				else
 				{
-	                outer.style.display='';
+                	Appcelerator.Compiler.compileElement(outer, state);
 				}
-			///},0);
+            }
+            // fix any issues from the new HTML (only matters in IE6 otherwise no-op)
+			if (Appcelerator.Compiler.isCompiledMode)
+			{
+            	compiledCode += 'Appcelerator.Browser.fixImageIssues();';
+			}
+			else
+			{
+            	Appcelerator.Browser.fixImageIssues();
+			}
+            // reset the display for the widget
+			if (outer)
+			{
+                outer.style.display='';
+			}
 		}
 	}
 	else
@@ -9275,7 +9634,9 @@ Appcelerator.Compiler.compileWidget = function(element,state)
 		  element.style.display = element.style.originalDisplay;
 		}
 	}
-};
+	return compiledCode;
+};
 Appcelerator.Compiler.determineScope = function(element)
 {
@@ -9312,13 +9673,14 @@ Appcelerator.Compiler.parseOnAttribute = function(element)
 	return false;
 };
-Appcelerator.Compiler.compileExpression = function (element,value,notfunction)
+Appcelerator.Compiler.parseExpression = function(value)
 {
     value = value.gsub('\n',' ');
     value = value.gsub('\r',' ');
     value = value.gsub('\t',' ');
     value = value.trim();
+    var thens = [];
     var ors = Appcelerator.Compiler.smartSplit(value,' or ');
 	for (var c=0,len=ors.length;c<len;c++)
@@ -9408,14 +9770,26 @@ Appcelerator.Compiler.compileExpression = function (element,value,notfunction)
 			}
 		}
-		$D('compiling condition=['+condition+'], action=['+action+'], elseAction=['+elseAction+'], delay=['+delay+'], ifCond=['+ifCond+']');
-		var handled = Appcelerator.Compiler.handleCondition(element,condition,action,elseAction,delay,ifCond);
+		thens.push([null,condition,action,elseAction,delay,ifCond]);
+	}
+	return thens;
+};
+Appcelerator.Compiler.compileExpression = function (element,value,notfunction)
+{
+	var clauses = Appcelerator.Compiler.parseExpression(value);
+	for(var i = 0; i < clauses.length; i++) {
+		var clause = clauses[i];
+        $D('compiling condition=['+clause[1]+'], action=['+clause[2]+'], elseAction=['+clause[3]+'], delay=['+clause[4]+'], ifCond=['+clause[5]+']');
+        clause[0] = element;
+        var handled = Appcelerator.Compiler.handleCondition.apply(this, clause);
-		if (!handled)
-		{
-			throw "syntax error: unknown condition type: "+condition+" for "+value;
-		}
+        if (!handled)
+        {
+            throw "syntax error: unknown condition type: "+clause[1]+" for "+value;
+        }
 	}
 };
@@ -9460,7 +9834,7 @@ Appcelerator.Compiler.registerCustomAction = function(name,callback)
 			code+='Appcelerator.Compiler.publishEvent("'+id+'","'+action+'");'; // TODO: is this needed?
 			code+='}';
 			code+='catch(exxx){';
-			code+=' Appcelerator.Compiler.handleElementException($("'+id+'"),exxx,"Executing:'+action+'");';
+			code+='Appcelerator.Compiler.handleElementException($("'+id+'"),exxx,"Executing:'+action+'");';
 			code+='}';
 			return code;
 		}
@@ -10377,10 +10751,31 @@ Appcelerator.Compiler.isCSSAttribute = function (name)
 		{
 			return true;
 		}
+		var css = Appcelerator.Compiler.CSSAttributes[c];
+		var index = css.indexOf('-');
+		if (index > 0)
+		{
+			var converted = css.substring(0,index) + css.substring(index+1).capitalize();
+			if (converted == name)
+			{
+				return true;
+			}
+		}
 	}
 	return false;
 };
+Appcelerator.Compiler.convertCSSAttribute = function (css)
+{
+	var index = css.indexOf('-');
+	if (index > 0)
+	{
+		var converted = css.substring(0,index) + css.substring(index+1).capitalize();
+		return converted;
+	}
+	return css;
+}
 //
 // start the compile once the document is loaded - we need to run this each
@@ -10389,126 +10784,150 @@ Appcelerator.Compiler.isCSSAttribute = function (name)
 //
 Appcelerator.Util.ServerConfig.addConfigListener(function()
 {
-	if (Appcelerator.Compiler.compileOnLoad)
+    if (Appcelerator.Compiler.compileOnLoad)
 	{
-        if (Appcelerator.Compiler.isCompiledMode)
+		// prototype/rhino problem
+		for (var name in Event.Methods)
+		{
+			delete Object.prototype[name];
+		}
+        var outputHandler;
+        if(Appcelerator.Compiler.isCompiledMode)
         {
-	        Appcelerator.Compiler.compileDocument(function()
-	        {
-	            if (Appcelerator.Compiler.isCompiledMode)
-	            {
-	                var html='';
-	                // add the version metadata
-	                var meta=window.document.createElement('meta');
-	                meta.setAttribute('name','generator');
-	                meta.setAttribute('content','Appcelerator '+Appcelerator.Version);
-	                Appcelerator.Core.HeadElement.appendChild(meta);
-	                // add the license metadata
-	                meta=window.document.createElement('meta');
-	                meta.setAttribute('name','license');
-	                meta.setAttribute('content',Appcelerator.LicenseMessage);
-	                Appcelerator.Core.HeadElement.appendChild(meta);
-	                var script=window.document.createElement('script');
-	                script.setAttribute('src','js/'+appcelerator_app_js);
-	                script.setAttribute('type','text/javascript');
-	                Appcelerator.Core.HeadElement.appendChild(script);
-	                var code = 'Appcelerator.Compiler.compileOnLoad=false;';
-	                if (Appcelerator.Compiler.compiledCode && Appcelerator.Compiler.compiledCode.length > 0)
-	                {
-	                    code+='Appcelerator.Core.onload(function(){';
-	                    // set scopes for all our elements
-	                    var jscode = 'function setScope(id,scope){var e = $(id); if (e) e.scope = scope;}';
-	                    for (var i in Appcelerator.Compiler.scopeMap)
-	                    {
-	                        var scope = Appcelerator.Compiler.scopeMap[i];
-	                        if (typeof(scope)=='string')
-	                        {
-	                            jscode+='setScope("'+i+'","'+scope+'");';
-	                        }
-	                    }
-	                    jscode+=Appcelerator.Compiler.compiledCode;
-	                    if (Appcelerator.Compiler.compressor)
-	                    {
-	                        // run the JS compressor
-	                        code+=Appcelerator.Compiler.compressor.compress(jscode);
-	                    }
-	                    else
-	                    {
-	                        code+=jscode;
-	                    }
-	                    code+='});';
-	                }
-	                // remove unnecessary ids from <head>
-	                Appcelerator.Core.HeadElement.getElementsByTagName('*').each(function(n)
-	                {
-	                    if (n.nodeType == 1 && Appcelerator.Compiler.automatedIDRegex.test(n.id))
-	                    {
-	                        n.removeAttribute('id');
-	                    }
-	                });
-	                if (Appcelerator.Compiler.automatedIDRegex.test(Appcelerator.Core.HeadElement.id))
-	                {
-	                    Appcelerator.Core.HeadElement.removeAttribute('id');
-	                }
-	                if (Appcelerator.Compiler.automatedIDRegex.test(Appcelerator.Core.HeadElement.parentNode.id))
-	                {
-	                    Appcelerator.Core.HeadElement.parentNode.removeAttribute('id');
-	                }
-	                //
-	                // sweep through and figure out which CSS links are not really
-	                // used by the app (since we import all on compile)
-	                //
-	                var css = {};
-	                document.getElementsByTagName('link').each(function(link)
-	                {
-	                    if (link.id)
-	                    {
-	                        css[link.id] = link;
-	                    }
-	                });
-	                for (var path in Appcelerator.Core.widgets_css)
-	                {
-	                    var module = Appcelerator.Core.widgets_css[path];
-	                    if (typeof module == 'string' && Appcelerator.Core.usedModules[module])
-	                    {
-	                        delete css['css_'+module];
-	                    }
-	                }
-	                for (var name in css)
-	                {
-	                    if (name && typeof(name)=='string' && name.indexOf('css_')!=-1)
-	                    {
-	                        var link = css[name];
-	                        link.parentNode.removeChild(link);
-	                    }
-	                }
-	                html+=Appcelerator.Util.Dom.getText(window.document.documentElement,false,null,true,true);
-	                Appcelerator.Compiler.compiledJS = code;
-	                Appcelerator.Compiler.compiledDocument = html;
-	            }
-	        });
-	    }
-	    else
-	    {
-            Appcelerator.Compiler.compileDocument();
-	    }
+            outputHandler = Appcelerator.Util.ServerConfig.outputCompiledDocument;
+        }
+        else
+        {
+            outputHandler = Prototype.K;
+        }
+        Appcelerator.Compiler.compileDocument(outputHandler);
 	}
 });
+Appcelerator.Util.ServerConfig.outputCompiledDocument = function()
+{
+    if (Appcelerator.Compiler.isCompiledMode)
+    {
+        var html='';
+        // add the version metadata
+        var meta=window.document.createElement('meta');
+        meta.setAttribute('name','generator');
+        meta.setAttribute('content','Appcelerator '+Appcelerator.Version);
+        Appcelerator.Core.HeadElement.appendChild(meta);
+        // add the license metadata
+        meta=window.document.createElement('meta');
+        meta.setAttribute('name','license');
+        meta.setAttribute('content',Appcelerator.LicenseMessage);
+        Appcelerator.Core.HeadElement.appendChild(meta);
+        var script=window.document.createElement('script');
+        script.setAttribute('src','js/'+appcelerator_app_js);
+        script.setAttribute('type','text/javascript');
+        Appcelerator.Core.HeadElement.appendChild(script);
+        var code = null;
+        // set scopes for all our elements
+        var codeArray = [
+            'Appcelerator.Compiler.compileOnLoad=false;',
+            'Appcelerator.Core.onload(function(){',
+            'function setScope(id,scope){var e = $(id); if (e) e.scope = scope;}'
+        ];
+        for (var i in Appcelerator.Compiler.scopeMap)
+        {
+            var scope = Appcelerator.Compiler.scopeMap[i];
+            if (typeof(scope)=='string')
+            {
+                codeArray.push('setScope("'+i+'","'+scope+'");');
+            }
+        }
+        if (Appcelerator.Compiler.compiledCode)
+        {
+            codeArray.push(Appcelerator.Compiler.compiledCode);
+        }
+        codeArray.push("var attributeProcessors = Appcelerator.Compiler.attributeProcessors;");
+        codeArray.push("function handleListener(elementId, attributeName, tagname, handlerIndex) {");
+        codeArray.push("var element = $(elementId); var value = element.getAttribute(attributeName);");
+        codeArray.push("attributeProcessors[tagname][handlerIndex][1].handle(element,attributeName,value);}");
+        var listeners = Appcelerator.Compiler.compiledAttributeListeners;
+        for(i = 0; i < listeners.length; i++) {
+            codeArray.push('handleListener("'+listeners[i].join('","')+'");');
+        }
+		codeArray.push('Appcelerator.Compiler.compileDocumentOnFinish();');
+        // close the entire onload handler
+        codeArray.push('});');
+        code = codeArray.join('');
+        if (Appcelerator.Compiler.compressor)
+        {
+            // run the JS compressor (a java class)
+            code = Appcelerator.Compiler.compressor.compress(code);
+        }
+        // remove unnecessary ids from <head>
+        Appcelerator.Core.HeadElement.getElementsByTagName('*').each(function(n)
+        {
+            if (n.nodeType == 1 && Appcelerator.Compiler.automatedIDRegex.test(n.id))
+            {
+                n.removeAttribute('id');
+            }
+        });
+        if (Appcelerator.Compiler.automatedIDRegex.test(Appcelerator.Core.HeadElement.id))
+        {
+            Appcelerator.Core.HeadElement.removeAttribute('id');
+        }
+        if (Appcelerator.Compiler.automatedIDRegex.test(Appcelerator.Core.HeadElement.parentNode.id))
+        {
+            Appcelerator.Core.HeadElement.parentNode.removeAttribute('id');
+        }
+        //
+        // sweep through and figure out which CSS links are not really
+        // used by the app (since we import all on compile)
+        //
+        var css = {};
+        document.getElementsByTagName('link').each(function(link)
+        {
+            if (link.id)
+            {
+                css[link.id] = link;
+            }
+        });
+        for (var path in Appcelerator.Core.widgets_css)
+        {
+            var module = Appcelerator.Core.widgets_css[path];
+            if (typeof module == 'string' && Appcelerator.Core.usedModules[module])
+            {
+                delete css['css_'+module];
+            }
+        }
+        for (var name in css)
+        {
+            if (name && typeof(name)=='string' && name.indexOf('css_')!=-1)
+            {
+                var link = css[name];
+                link.parentNode.removeChild(link);
+            }
+        }
+        html+=Appcelerator.Util.Dom.getText(window.document.documentElement,false,null,true,true);
+        Appcelerator.Compiler.compiledJS = code;
+        Appcelerator.Compiler.compiledDocument = html;
+    }
+};
 Appcelerator.Compiler.setHTML = function(element,html)
 {
@@ -10823,9 +11242,9 @@ Appcelerator.Util.Dom =
         var html = '';
         this.eachAttribute(element, function(name, value)
         {
-            if (!excludes || !excludes.exists(name))
+            if (false == (excludes && excludes.indexOf(name) > -1))
             {
-                html += name + '="' + String.escapeXML(value||'') + '" ';
+				html += name + '="' + String.escapeXML(value||'') + '" ';
             }
         }, null, true);
         return html;
@@ -11073,7 +11492,6 @@ Appcelerator.Util.ServiceBroker =
     initQueue:[],
     timer: null,
     time: null,
-    currentRequestId:1,
     serverDown: false,
     poll: false,
     fetching: false,
@@ -11082,8 +11500,11 @@ Appcelerator.Util.ServiceBroker =
     localPatternListeners: [],
     remotePatternListeners: [],
     devmode: (window.location.href.indexOf('devmode=1') > 0),
-    disabled: this.devmode || (window.location.href.indexOf('file:/') == 0) || Appcelerator.Parameters['mbDisabled']=='1',
-	remoteDisabled: this.disabled || Appcelerator.Parameters['remoteDisabled']=='1',
+    disabled: this.devmode || (window.location.href.indexOf('file:/') == 0) || Appcelerator.Parameters.get('mbDisabled')=='1',
+	remoteDisabled: this.disabled || Appcelerator.Parameters.get('remoteDisabled')=='1',
+	marshaller:'xml/json',
+	transport:'appcelerator',
+	multiplex:true,
     toString: function ()
     {
@@ -11392,61 +11813,13 @@ Appcelerator.Util.ServiceBroker =
         }
 		this.localMessageQueue.push([name,data,dest,scope,version]);
     },
-    processIncoming: function (xml)
-    {
-        if (xml)
-        {
-            var children = xml.documentElement.childNodes;
-            if (children && children.length > 0)
-            {
-                for (var c = 0; c < children.length; c++)
-                {
-                    var child = children.item(c);
-                    if (child.nodeType == Appcelerator.Util.Dom.ELEMENT_NODE)
-                    {
-                        var requestid = child.getAttribute("requestid");
-                        try
-                        {
-                            this.dispatch(requestid, child);
-                        }
-                        catch (e)
-                        {
-                            $E(this + ' - Error in dispatch of message. ' + Object.getExceptionDetail(e));
-                        }
-                    }
-                }
-            }
-        }
-    },
-    dispatch: function (requestid, msg)
+    dispatch: function (msg)
     {
-        var type = msg.getAttribute("type");
-        var datatype = msg.getAttribute("datatype");
-        var scope = msg.getAttribute("scope") || 'appcelerator';
-        var data = msg;
-        if (datatype == 'JSON')
-        {
-            var text;
-            try
-            {
-                text = Appcelerator.Util.Dom.getText(msg);
-                data = text.evalJSON();
-                data.toString = function ()
-                {
-                    return Object.toJSON(this);
-                };
-                $D(this.toString() + ' received remote message, type:' + type + ',data:' + data);
-            }
-            catch (e)
-            {
-                $E('Error received evaluating: ' + text + ' for ' + msg + ', type:' + type + ", " + Object.getExceptionDetail(e));
-                return;
-            }
-        }
+		var requestid = msg.requestid;
+        var type = msg.type;
+        var datatype = msg.datatype;
+        var scope = msg.scope;
+        var data = msg.data;
         // let the interceptors have at it
         if (this.interceptors.length > 0)
@@ -11458,7 +11831,7 @@ Appcelerator.Util.ServiceBroker =
                 var func = interceptor['interceptDispatch'];
                 if (func)
                 {
-                    var result = func.apply(interceptor, [requestid,type,data,datatype,scope]);
+                    var result = func.apply(interceptor, [requestid,type,msg,datatype,scope]);
                     if (result != null && !result)
                     {
                         send = false;
@@ -11552,8 +11925,6 @@ Appcelerator.Util.ServiceBroker =
     deliver: function (initialrequest)
     {
-        var xml = null;
         if (this.messageQueue == null)
         {
             // we're dead and destroyed, cool, just
@@ -11566,94 +11937,89 @@ Appcelerator.Util.ServiceBroker =
 			// remote disabled
             return;
 		}
+		// get the marshaller to use
+		var marshaller = Appcelerator.Util.ServiceBrokerMarshaller[this.marshaller];
+		if (!marshaller)
+		{
+			$E(this+' - no marshaller defined, will not send message to remote endpoint');
+			this.remoteDisabled = true;
+			return;
+		}
+		var transportHandler = Appcelerator.Util.ServiceBrokerTransportHandler[this.transport];
+		if (!transportHandler)
+		{
+			$E(this+' - no transport handler defined, will not send message to remote endpoint');
+			this.remoteDisabled = true;
+			return;
+		}
-        // send	if we have stuff
-        var time = new Date();
-        var timestamp = time.getTime();
-        if (this.messageQueue.length > 0)
-        {
-            xml = "<?xml version='1.0'?>\n";
-			var tz = time.getTimezoneOffset()/60;
-            var idleMs = Appcelerator.Util.IdleManager.getIdleTimeInMS();
-            xml += "<request version='1.0' idle='" + idleMs + "' timestamp='"+timestamp+"' tz='"+tz+"'>\n";
-            for (var c = 0,len = this.messageQueue.length; c < len; c++)
-            {
-                var msg = this.messageQueue[c];
-                var requestid = this.currentRequestId++;
-                var scope = msg[2];
-                var version = msg[3];
-                var datatype = 'JSON';
-                var data = msg[0]['data'];
-                xml += "<message requestid='" + requestid + "' type='" + msg[0]['type'] + "' datatype='" + datatype + "' scope='"+scope+"' version='"+version+"'>";
-                xml += '<![CDATA[' + Object.toJSON(data) + ']]>';
-                xml += "</message>";
-            }
-            this.messageQueue.clear();
-            xml += "</request>";
-        }
-		// get the auth token
-		var cookieName = Appcelerator.ServerConfig['sessionid'].value||'JSESSIONID';
-		var authToken = Appcelerator.Util.Cookie.GetCookie(cookieName);
-		// calculate the token we send back to the server
-		var token = (authToken) ? Appcelerator.Util.MD5.hex_md5(authToken+this.instanceid) : '';
-        var _method = (xml == null) ? 'get' : 'post';
-        var p = (initialrequest && xml == null) ? "?maxwait=1&initial=1&instanceid="+this.instanceid : "?maxwait=" + ((!initialrequest && xml) ? this.maxWaitPollTime : this.maxWaitPollTimeWhenSending)+"&instanceid="+this.instanceid+'&auth='+token+'&ts='+timestamp;
+		this.fetching = true;
+		var payloadObj = marshaller.serialize(this.messageQueue,this.multiplex);
+		var payload = payloadObj.postBody;
+		var contentType = payloadObj.contentType;
+		var instructions = transportHandler.prepare(this,initialrequest,payload,contentType);
+		if (this.multiplex)
+		{
+			this.messageQueue.clear();
+		}
+		else
+		{
+			if (this.messageQueue.length > 0)
+			{
+				this.messageQueue.removeAt(0);
+			}
+		}
-        Logger.trace(this.toString() + ' Sending (poll=' + (this.poll) + '): ' + (xml || '<empty>'));
+		var url = instructions.url;
+		var method = instructions.method;
+		var postBody = instructions.postBody;
+		var contentType = instructions.contentType;
-        this.fetching = true;
-  		this.sendRequest(p,_method,xml,0)
+		this.sendRequest(url,method,postBody,contentType,marshaller,0);
+		if (!this.multiplex && this.messageQueue.length > 0)
+		{
+			this.deliver.defer();
+		}
 	},
-	sendRequest: function(p,_method,xml,count)
+	sendRequest: function(url,method,body,contentType,marshaller,count)
 	{
-		count = count++;
+		count = count+1;
 		if (count > 3)
 		{
+			self.fetching = false;
 			$E('too many attempts sending a re-authorization request.');
 			return;
 		}
 		var self = this;
-        new Ajax.Request(this.serverPath + p,
+        new Ajax.Request(url,
         {
             asynchronous: true,
-            method: _method,
-            postBody: xml || "",
-            contentType: 'text/xml',
+            method: method,
+            postBody: body,
+            contentType: contentType,
+			evalJSON:false,
+			evalJS:false,
             onComplete: function()
             {
                 self.fetching = false;
             },
             onSuccess: function (result)
             {
-                setTimeout(function()
+                (function()
                 {
 	                self.fetching = false;
 	                self.startTimer(false);
-	                if (result && result.status)
-	                {
-	                    if (result.status == 401)
-	                    {
-	                        self.onServiceBrokerInvalidLogin();
-	                        return;
-	                    }
-	                    // 204 is no content, in which case the content-type is text/plain
-	                    if (result.status != 204 && result.status != 202)
-	                    {
-	                        var contentType = result.getResponseHeader('Content-type');
-	                        // do indexOf instead of equals since we sometime tack on the character encoding
-	                        if (!contentType || contentType.indexOf('text/xml') == -1)
-	                        {
-	                            // this most likely means we've been redirected on the
-	                            // server to another page or something, in which case
-	                            // we (default) will just go to the landing page
-	                            self.onServiceBrokerInvalidContentType(contentType);
-	                            return;
-	                        }
-	                    }
+					if (result && result.status && result.status >= 200 && result.status < 300)
+					{
 	                    if (self.serverDown)
 	                    {
 	                        self.serverDown = false;
@@ -11661,33 +12027,23 @@ Appcelerator.Util.ServiceBroker =
 	                        if (Logger.infoEnabled) Logger.info('[' + Appcelerator.Util.DateTime.get12HourTime(new Date(), true, true) + '] ' + self.toString() + ' Server is UP at ' + self.serverPath);
 	                        self.queue({type:'local:appcelerator.servicebroker.server.up',data:{path:this.serverPath,downtime:downtime}});
 	                    }
-	                    if (result.status == 200)
-	                    {
-	                        var skip = false;
-	                        var cl = result.getResponseHeader("Content-Length");
-	                        if (cl && cl == "0")
-	                        {
-	                            // this is OK, just means no messages from the other side
-	                            skip = true;
-	                            $D(self.toString() + ' Receiving no messages on response');
-	                        }
-	                        if (!skip)
-	                        {
-	                            // now process them
-	                            $D('[' + Appcelerator.Util.DateTime.get12HourTime(new Date(), true, true) + '] ' + self.toString() + ' Receiving: ' + result.responseText);
-	                            self.processIncoming(result.responseXML);
-	                        }
-	                    }
-	                }
-	                // 204 is no content, which is OK
-	                // 503 is service unavailable, which we handle already
-	                if (result && result.status && result.status != 200 && result.status != 503 && result.status != 204 && result.status != 202)
-	                {
-	                    $E(self.toString() + ' Response Failure: ' + result.status + ' ' + result.statusText);
-	                }
-                },0);
+                        var cl = parseInt(result.getResponseHeader("Content-Length") || '1');
+						var contentType = result.getResponseHeader('Content-Type') || 'unknown';
+                        if (cl > 0)
+                        {
+							var msgs = marshaller.deserialize(result,parseInt(cl),contentType);
+							if (msgs && msgs.length > 0)
+							{
+								for (var c=0;c<msgs.length;c++)
+								{
+		                            self.dispatch(msgs[c]);
+								}
+							}
+						}
+					}
+                }).defer();
             },
             onFailure: function (transport, json)
             {
@@ -11697,13 +12053,13 @@ Appcelerator.Util.ServiceBroker =
                     if (!cl)
                     {
                     	Logger.warn("Failed authentication, will retry 1 more time");
-			  			self.sendRequest(p+"&retry=1",_method,xml,count);
+			  			self.sendRequest(url,method,body,contentType,marshaller,count);
 			  			return;
                     }
             	}
 				if (transport.status == 406)
 				{
-			  		self.sendRequest(p,_method,xml,count);
+			  		self.sendRequest(url,method,body,contentType,marshaller,count);
 					return;
 				}
                 self.fetching = false;
@@ -11769,7 +12125,7 @@ Appcelerator.Util.ServiceBroker =
             for (var p in this.localDirectListeners)
             {
                 var a = this.localDirectListeners[p];
-                if (typeof(a) == 'array')
+                if (Object.isArray(a))
                 {
                     a.clear();
                 }
@@ -11781,7 +12137,7 @@ Appcelerator.Util.ServiceBroker =
             for (var p in this.remoteDirectListeners)
             {
                 var a = this.remoteDirectListeners[p];
-                if (typeof(a) == 'array')
+                if (Object.isArray(a))
                 {
                     a.clear();
                 }
@@ -12020,7 +12376,7 @@ function $MQL (type,f,myscope,element)
 	{
 		accept: function ()
 		{
-			if (typeof(type)=='array')
+			if (Object.isArray(type))
 			{
 				return type;
 			}
@@ -12053,6 +12409,301 @@ function $MQL (type,f,myscope,element)
 	return listener;
 }
+Appcelerator.Util.ServiceBrokerMarshaller={};
+Appcelerator.Util.ServiceBrokerMarshaller['xml/json'] =
+{
+	currentRequestId:1,
+	jsonify:function(msg)
+	{
+        var requestid = this.currentRequestId++;
+        var scope = msg[2];
+        var version = msg[3];
+        var datatype = 'JSON';
+        var data = msg[0]['data'];
+        var xml = "<message requestid='" + requestid + "' type='" + msg[0]['type'] + "' datatype='" + datatype + "' scope='"+scope+"' version='"+version+"'>";
+        xml += '<![CDATA[' + Object.toJSON(data) + ']]>';
+        xml += "</message>";
+		return xml;
+	},
+	serialize: function(messageQueue,multiplex)
+	{
+		var xml = null;
+        if (messageQueue.length > 0)
+        {
+			xml = '';
+	        var time = new Date();
+	        var timestamp = time.getTime();
+            xml = "<?xml version='1.0'?>\n";
+			var tz = time.getTimezoneOffset()/60;
+            var idleMs = Appcelerator.Util.IdleManager.getIdleTimeInMS();
+            xml += "<request version='1.0' idle='" + idleMs + "' timestamp='"+timestamp+"' tz='"+tz+"'>\n";
+			if (multiplex)
+			{
+	            for (var c = 0,len = messageQueue.length; c < len; c++)
+	            {
+					xml+=this.jsonify(messageQueue[c]);
+	            }
+			}
+			else
+			{
+				xml+=this.jsonify(messageQueue[0]);
+			}
+            xml += "</request>";
+        }
+		return {
+			'postBody': xml,
+			'contentType':'text/xml'
+		};
+	},
+	deserialize: function(response,length,contentType)
+	{
+		if (response.status == 202)
+		{
+			return null;
+		}
+		if (contentType.indexOf('text/xml')==-1)
+		{
+			$E(this+', invalid content type: '+contentType+', excepted: text/xml');
+			return null;
+		}
+		var xml = response.responseXML;
+		if (!xml)
+		{
+			return null;
+		}
+        var children = xml.documentElement.childNodes;
+		var msgs = null;
+        if (children && children.length > 0)
+        {
+			msgs = [];
+            for (var c = 0; c < children.length; c++)
+            {
+                var child = children.item(c);
+                if (child.nodeType == Appcelerator.Util.Dom.ELEMENT_NODE)
+                {
+                    var requestid = child.getAttribute("requestid");
+                    try
+                    {
+				        var type = child.getAttribute("type");
+				        var datatype = child.getAttribute("datatype");
+				        var scope = child.getAttribute("scope") || 'appcelerator';
+			            var data, text;
+			            try
+			            {
+			                text = Appcelerator.Util.Dom.getText(child);
+			                data = text.evalJSON();
+			                data.toString = function () { return Object.toJSON(this); };
+			            }
+			            catch (e)
+			            {
+			                $E('Error received evaluating: ' + text + ' for type: ' + type + ", error: " + Object.getExceptionDetail(e));
+			                return;
+			            }
+		                $D(this.toString() + ' received remote message, type:' + type + ',data:' + data);
+						msgs.push({type:type,data:data,datatype:datatype,scope:scope,requestid:requestid});
+                    }
+                    catch (e)
+                    {
+                        $E(this + ' - Error in dispatch of message. ' + Object.getExceptionDetail(e));
+                    }
+                }
+            }
+        }
+		return msgs;
+	}
+};
+function jsonParameterEncode (key, value, array)
+{
+	switch(typeof(value))
+	{
+		case 'string':
+		case 'number':
+		case 'boolean':
+		{
+			array.push(key+'='+encodeURIComponent(value));
+			break;
+		}
+		case 'array':
+		case 'object':
+		{
+			// check to see if the object is an array
+			if (Object.isArray(value))
+			{
+				for (var c=0;c<value.length;c++)
+				{
+					jsonParameterEncode(key+'.'+c,value[c],array);
+				}
+			}
+			else
+			{
+				for (var p in value)
+				{
+					jsonParameterEncode(key+'.'+p,value[p],array);
+				}
+			}
+			break;
+		}
+		case 'function':
+		{
+			break;
+		}
+		default:
+		{
+			array.push(encodeURIComponent(key)+'=');
+			break;
+		}
+	}
+}
+function jsonToQueryParams(json)
+{
+	var parameters = [];
+	for (var key in json)
+	{
+		var value = json[key];
+		jsonParameterEncode(key,value,parameters);
+	}
+	return parameters.join('&');
+};
+/**
+ * given an element will encode the element and it's children to
+ * json
+ */
+function json_encode_xml (node,json)
+{
+   var obj = {};
+   var found = json[node.nodeName];
+   if (found)
+   {
+       if (Object.isArray(found))
+       {
+          found.push(obj);
+       }
+       else
+       {
+          json[node.nodeName] = [found,obj];
+       }
+   }
+   else
+   {
+       json[node.nodeName] = obj;
+   }
+   Appcelerator.Util.Dom.eachAttribute(node,function(name,value)
+   {
+       obj[name]=value;
+   });
+   var added = false;
+   Appcelerator.Util.Dom.each(node.childNodes,Appcelerator.Util.Dom.ELEMENT_NODE,function(child)
+   {
+       json_encode_xml(child,obj);
+       added = true;
+   });
+   if (!added)
+   {
+     var text = Appcelerator.Util.Dom.getText(node);
+     json[node.nodeName] = text;
+   }
+}
+/**
+ * Form URL encoded service marshaller
+ */
+Appcelerator.Util.ServiceBrokerMarshaller['application/x-www-form-urlencoded'] =
+{
+	currentRequestId:1,
+	parameterize: function(msg)
+	{
+        var requestid = this.currentRequestId++;
+        var scope = msg[2];
+        var version = msg[3];
+        var datatype = 'JSON';
+        var data = msg[0]['data'];
+		var str = '$messagetype='+msg[0]['type']+'&$requestid='+requestid+'&$datatype='+datatype+'&$scope='+scope+'&$version='+version;
+		if (data)
+		{
+			str+='&' + jsonToQueryParams(data);
+		}
+		return str;
+	},
+	serialize: function(messageQueue,multiplex)
+	{
+		var xml = null;
+        if (messageQueue.length > 0)
+        {
+			xml = '';
+			if (multiplex)
+			{
+	            for (var c = 0,len = messageQueue.length; c < len; c++)
+	            {
+					xml+=this.parameterize(messageQueue[c]);
+	            }
+			}
+			else
+			{
+				xml+=this.parameterize(messageQueue[0]);
+			}
+        }
+		return {
+			'postBody': xml,
+			'contentType':'application/x-www-form-urlencoded'
+		};
+	},
+	deserialize: function(response,length,contentType)
+	{
+		if (response.status == 202)
+		{
+			return null;
+		}
+		if (contentType.indexOf('/json')==-1)
+		{
+			$E(this+', invalid content type: '+contentType+', excepted json mimetype');
+			return null;
+		}
+		return [response.responseText.evalJSON(true)];
+	}
+};
+Appcelerator.Util.ServiceBrokerTransportHandler = {};
+/**
+ * Appcelerator based protocol transport handler
+ */
+Appcelerator.Util.ServiceBrokerTransportHandler['appcelerator'] =
+{
+	prepare: function(serviceBroker,initialrequest,payload,contentType)
+	{
+		// get the auth token
+		var cookieName = Appcelerator.ServerConfig['sessionid'].value||'JSESSIONID';
+		var authToken = Appcelerator.Util.Cookie.GetCookie(cookieName);
+		// calculate the token we send back to the server
+		var token = (authToken) ? Appcelerator.Util.MD5.hex_md5(authToken+serviceBroker.instanceid) : '';
+		// create parameters for URL
+        var parameters = "?maxwait=" + ((!initialrequest && payload) ? serviceBroker.maxWaitPollTime : serviceBroker.maxWaitPollTimeWhenSending)+"&instanceid="+serviceBroker.instanceid+'&auth='+token+'&ts='+new Date().getTime();
+		var url = serviceBroker.serverPath + parameters;
+		var method = payload ? 'post' : 'get';
+		return {
+			'url':url,
+			'method': method,
+			'postBody': payload||'',
+			'contentType':contentType
+		};
+	}
+};
 Appcelerator.Util.ServiceBrokerInterceptor = Class.create();
 /**
  * ServiceBrokerInterceptor interceptor prototype class
@@ -12104,6 +12755,9 @@ else
 		}
 		Appcelerator.Util.ServiceBroker.serverPath = config.value;
 		Appcelerator.Util.ServiceBroker.poll = (config.poll == 'true');
+		Appcelerator.Util.ServiceBroker.multiplex = config.multiplex ? (config.multiplex == 'true') : true;
+		Appcelerator.Util.ServiceBroker.transport = config.transport || Appcelerator.Util.ServiceBroker.transport;
+		Appcelerator.Util.ServiceBroker.marshaller = config.marshaller || Appcelerator.Util.ServiceBroker.marshaller;
         Appcelerator.Util.ServiceBroker.triggerConfig();
         Appcelerator.Util.ServiceBroker.startTimer();
         Logger.info('ServiceBroker ready');
@@ -12148,12 +12802,15 @@ else
 	}
 }
 Appcelerator.Core.onunload(Appcelerator.Util.ServiceBroker.destroy.bind(Appcelerator.Util.ServiceBroker));
 Appcelerator.Compiler.afterDocumentCompile(function()
 {
 	Appcelerator.Util.ServiceBroker.triggerComplete();
 });
 Appcelerator.Compiler.registerCustomAction('show',
 {
 	build: function(id,action,params)
@@ -12268,6 +12925,7 @@ Appcelerator.Compiler.registerCustomAction('toggle',
 			{
 				if (Appcelerator.Compiler.isCSSAttribute(key))
 				{
+					key = Appcelerator.Compiler.convertCSSAttribute(key);
 					switch (key)
 					{
 						case 'display':
@@ -12330,6 +12988,7 @@ var addsetBuilder =
 		var value = obj.value;
 		if (Appcelerator.Compiler.isCSSAttribute(key))
 		{
+			key = Appcelerator.Compiler.convertCSSAttribute(key);
 			return "Element.setStyle('" + id + "',{'" + key + "':" + Appcelerator.Compiler.generateSetter(value) + "})";
 		}
 		else if (key == 'class')
@@ -12477,14 +13136,6 @@ Appcelerator.Compiler.buildActionFunction = function(id,method,params,checkenabl
 	return prefix + 'Appcelerator.Compiler.executeFunction("'+target+'","'+method+'",["'+target+'","'+method+'",this.data,this.scope])' + suffix;
 };
-Appcelerator.Compiler.registerCustomAction('execute',
-{
-	build: function(id,action,params)
-	{
-		return Appcelerator.Compiler.buildActionFunction(id,'execute',params);
-	}
-});
 Appcelerator.Compiler.registerCustomAction('selectOption',
 {
 	build: function(id,action,params)
@@ -12971,7 +13622,17 @@ for (var c=0,len=Appcelerator.Compiler.GenericFunctions.length;c<len;c++)
 	var f = new GenericActionFunction(gf[1]);
 	Appcelerator.Compiler.registerCustomAction(gf[0],f);
 }
-Appcelerator.Compiler.registerCustomAction('history',
+Appcelerator.Compiler.buildCustomAction = function (name)
+{
+	var action = Appcelerator.Compiler.customActions[name];
+	if (!action)
+	{
+		var f = new GenericActionFunction(false);
+		Appcelerator.Compiler.registerCustomAction(name,f);
+	}
+};Appcelerator.Compiler.registerCustomAction('history',
 {
 	build: function(id,action,params)
 	{
@@ -13140,7 +13801,6 @@ Appcelerator.Compiler.registerCustomCondition(function(element,condition,action,
 	'blur',
 	'dblclick',
 	'mousedown',
-	'resize',
 	'mouseout',
 	'mouseover',
 	'mousemove',
@@ -13485,7 +14145,33 @@ Appcelerator.Compiler.MessageAction.makeMBListener = function(element,type,actio
 	return true;
 };
+Appcelerator.Compiler.registerCustomCondition(function(element,condition,action,elseAction,delay,ifCond)
+{
+	if (condition == 'resize')
+	{
+		if (!element.getAttribute('resizable'))
+		{
+			throw "resize condition only applies to elements that have resizable attribute";
+		}
+		if (!element.resizeListeners)
+		{
+			element.resizeListeners = [];
+		}
+		var actionFunc = Appcelerator.Compiler.makeConditionalAction(element.id,action,ifCond);
+		element.resizeListeners.push(
+		{
+			onResize: function(e)
+			{
+				Appcelerator.Compiler.executeAfter(actionFunc,delay,{id:element.id});
+			}
+		});
+		return true;
+	}
+	return false;
+});
 Appcelerator.Compiler.Selected = {};
 Appcelerator.Compiler.Selected.makeSelectedListener = function(element,condition,action,elseAction,delay,ifCond)
 {
@@ -14664,6 +15350,11 @@ Appcelerator.Compiler.afterDocumentCompile(function()
     {
     	Appcelerator.History.loadIE();
     }
+    else if (Appcelerator.Compiler.isCompiledMode)
+    {
+        // init.js does not define history, maybe it should
+        return;
+    }
     else
     {
     	// THIS TRICK CAME FROM YUI's HISTORY COMPONENT
@@ -14897,6 +15588,11 @@ if (Appcelerator.Browser.isIE6)
 	Appcelerator.Browser.fixBackgroundPNG = function(obj)
 	{
+		if (obj.style.backgroundImage.indexOf('blank_1x1.gif') > 0)
+		{
+			obj.style.backgroundImage = '';
+		}
+		obj.style.filter = '';
 		var bg	= obj.currentStyle.backgroundImage;
 		var src = bg.substring(5,bg.length-2);
 		var scale = obj.currentStyle.backgroundRepeat == 'no-repeat' ? 'image' : 'scale';
@@ -14958,7 +15654,7 @@ Appcelerator.Browser.fixImageIssues = function()
 		for (var i = document.all.length - 1, obj = null; (obj = document.all[i]); i--)
 		{
-			if (obj.currentStyle.backgroundImage.match(/\.png/i) != null)
+			if (obj.currentStyle.backgroundImage.match(/(\.png)|(blank_1x1\.gif)/i) != null)
 			{
 				Appcelerator.Browser.fixBackgroundPNG(obj);
 				//obj.attachEvent("onpropertychange", fnPropertyChanged);
@@ -15800,11 +16496,11 @@ Appcelerator.Util.MD5 =
 // register our input button listener for handling
 // activators
 //
-Appcelerator.Compiler.registerAttributeProcessor('input','activators',
+Appcelerator.Compiler.registerAttributeProcessor(['div','input','button'],'activators',
 {
 	handle: function(element,attribute,value)
 	{
-		if (value && element.getAttribute('type') == 'button')
+		if (value && (element.nodeName == 'DIV' || element.getAttribute('type') == 'button' || element.nodeName == 'BUTTON'))
 		{
 			// see if we're part of a field set and if so, add
 			// our reference
@@ -15826,7 +16522,17 @@ Appcelerator.Compiler.registerAttributeProcessor('input','activators',
 							break;
 						}
 					}
+					element.setAttribute('disabled',!valid);
 					element.disabled = !valid;
+					if (element.disabled && element.onActivatorsDisable)
+					{
+						element.onActivatorsDisable();
+					}
+					if (!element.disabled && element.onActivatorsEnable)
+					{
+						element.onActivatorsEnable();
+					}
 				};
 				for (var c=0,len=fields.length;c<len;c++)
 				{
@@ -16045,6 +16751,38 @@ Appcelerator.Compiler.registerAttributeProcessor('*','on',
 		}
 	}
 });//
+// register our resizable attribute listener
+//
+Appcelerator.Compiler.registerAttributeProcessor(['div','img', 'table'],'resizable',
+{
+	handle: function(element,attribute,value)
+	{
+		if (value && value!='false')
+		{
+			var options = value == "true" ? {} : value.evalJSON();
+			options.resize = function(e)
+			{
+				var listeners = element.resizeListeners;
+				if (listeners && listeners.length > 0)
+				{
+					for (var c=0;c<listeners.length;c++)
+					{
+						var cb = listeners[c];
+						cb.onResize(e);
+					}
+				}
+			};
+			element.resizable = new Resizeable(element.id, options);
+			Appcelerator.Compiler.addTrash(element, function()
+			{
+				element.resizable.destroy();
+			});
+		}
+	}
+});
+//
 // add a selectable attribute which implements a single state selection
 // for all children of element passed in
 //