From seam-commits at lists.jboss.org Sun Jan  3 21:09:18 2010
Content-Type: multipart/mixed; boundary="===============0140795194521756241=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r11906 - in modules/remoting/trunk:
 src/main/java/org/jboss/seam/remoting and 1 other directories.
Date: Sun, 03 Jan 2010 21:09:18 -0500
Message-ID: <201001040209.o0429IBS004560@svn01.web.mwc.hst.phx2.redhat.com>

--===============0140795194521756241==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: shane.bryzak(a)jboss.com
Date: 2010-01-03 21:09:18 -0500 (Sun, 03 Jan 2010)
New Revision: 11906

Modified:
   modules/remoting/trunk/examples/model/src/main/webapp/model.html
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Remoting.ja=
va
   modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote=
.js
Log:
add support for resource compression and caching - result of raw size reduc=
tion of remote.js from 36.8k to 31k


Modified: modules/remoting/trunk/examples/model/src/main/webapp/model.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/remoting/trunk/examples/model/src/main/webapp/model.html	2010-0=
1-03 23:15:01 UTC (rev 11905)
+++ modules/remoting/trunk/examples/model/src/main/webapp/model.html	2010-0=
1-04 02:09:18 UTC (rev 11906)
@@ -10,7 +10,7 @@
 =

   <h1>Seam Remoting - Model Example</h1>
   =

-  <script type=3D"text/javascript" src=3D"seam/resource/remoting/resource/=
remote.js"></script>
+  <script type=3D"text/javascript" src=3D"seam/resource/remoting/resource/=
remote.js?compress=3Dtrue"></script>
   =

   <script type=3D"text/javascript">    =

     //<![CDATA[

Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Remo=
ting.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Remoting.j=
ava	2010-01-03 23:15:01 UTC (rev 11905)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Remoting.j=
ava	2010-01-04 02:09:18 UTC (rev 11906)
@@ -1,5 +1,6 @@
 package org.jboss.seam.remoting;
 =

+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -56,6 +57,8 @@
     * one context path.
     */
    private Map<String, byte[]> cachedConfig =3D new HashMap<String, byte[]=
>();
+   =

+   private Map<String, byte[]> resourceCache =3D new HashMap<String, byte[=
]>();
 =

    private static final Logger log =3D LoggerFactory.getLogger(Remoting.cl=
ass);
 =

@@ -108,45 +111,91 @@
 =

    /**
     * =

-    * @param resourceName
-    *           String
-    * @param out
-    *           OutputStream
+    * @param resourceName String The name of the resource to serve
+    * @param out OutputStream The OutputStream to write the resource to
     */
-   private void writeResource(String resourceName, HttpServletResponse res=
ponse)
+   private void writeResource(String resourceName, HttpServletResponse res=
ponse,
+         boolean compress)
          throws IOException
    {
-      // Only allow resource requests for .js files
-      if (resourceName.endsWith(".js"))
+      String cacheKey =3D resourceName + ":" + Boolean.toString(compress);
+      if (!resourceCache.containsKey(cacheKey))
       {
-         InputStream in =3D this.getClass().getClassLoader().getResourceAs=
Stream(
-               "org/jboss/seam/remoting/" + resourceName);
-         try
+         synchronized(resourceCache)
          {
-            if (in !=3D null)
+            if (!resourceCache.containsKey(cacheKey))
             {
-               response.setContentType("text/javascript");
-
-               byte[] buffer =3D new byte[1024];
-               int read =3D in.read(buffer);
-               while (read !=3D -1)
+               ByteArrayOutputStream out =3D new ByteArrayOutputStream();
+               =

+               // Only allow resource requests for .js files
+               if (resourceName.endsWith(".js"))
                {
-                  response.getOutputStream().write(buffer, 0, read);
-                  read =3D in.read(buffer);
+                  InputStream in =3D this.getClass().getClassLoader().getR=
esourceAsStream(
+                        "org/jboss/seam/remoting/" + resourceName);
+                  try
+                  {
+                     if (in !=3D null)
+                     {
+                        response.setContentType("text/javascript");
+      =

+                        byte[] buffer =3D new byte[1024];
+                        int read =3D in.read(buffer);
+                        while (read !=3D -1)
+                        {
+                           out.write(buffer, 0, read);
+                           read =3D in.read(buffer);
+                        }
+                        =

+                        resourceCache.put(cacheKey, compress ? =

+                              compressResource(out.toByteArray()) : out.to=
ByteArray());
+                        =

+                        response.getOutputStream().write(resourceCache.get=
(cacheKey));
+                     } =

+                     else
+                     {
+                        log.error(String.format("Resource [%s] not found."=
, resourceName));
+                     }
+                  } =

+                  finally
+                  {
+                     if (in !=3D null) in.close();
+                  }
                }
-            } else
-            {
-               log.error(String
-                     .format("Resource [%s] not found.", resourceName));
             }
-         } finally
-         {
-            if (in !=3D null)
-               in.close();
          }
       }
+      else
+      {
+         response.getOutputStream().write(resourceCache.get(cacheKey));
+      }
    }
+   =

+   /**
+    * Compresses JavaScript resources by removing comments, cr/lf, leading=
 and
+    * trailing white space.
+    * =

+    * @param resourceData The resource data to compress.
+    * @return
+    */
+   private byte[] compressResource(byte[] resourceData)
+   {
+      String resource =3D new String(resourceData);
 =

+      // Remove comments
+      resource =3D resource.replaceAll("//[^\\n\\r]*[\\n\\r]", "");
+      =

+      // Remove leading and trailing space and CR/LF's for lines with a st=
atement terminator =

+      resource =3D resource.replaceAll(";\\s*[\\n\\r]+\\s*", ";");
+      =

+      // Remove leading and trailing space and CR/LF's for lines with a bl=
ock terminator =

+      resource =3D resource.replaceAll("}\\s*[\\n\\r]+\\s*", "}");
+      =

+      // Replace any remaining leading/trailing space and CR/LF with a sin=
gle space
+      resource =3D resource.replaceAll("\\s*[\\n\\r]+\\s*", " ");
+      =

+      return resource.getBytes();
+   }
+
    public int getPollTimeout()
    {
       return pollTimeout;
@@ -231,7 +280,10 @@
 =

                if (REMOTING_RESOURCE_PATH.equals(path))
                {
-                  writeResource(resource, response);
+                  String compressParam =3D request.getParameter("compress"=
);
+                  boolean compress =3D compressParam !=3D null && "true".e=
quals(compressParam);
+                  =

+                  writeResource(resource, response, compress);
                   if ("remote.js".equals(resource))
                   {
                      appendConfig(response.getOutputStream(), request

Modified: modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting=
/remote.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remot=
e.js	2010-01-03 23:15:01 UTC (rev 11905)
+++ modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remot=
e.js	2010-01-04 02:09:18 UTC (rev 11906)
@@ -6,7 +6,7 @@
   PATH_SUBSCRIPTION: "/subscription",
   PATH_MODEL: "/model",
   PATH_POLL: "/poll"
-}
+};
 =

 Seam.createBean =3D function(name) {
   if (!Seam.beans[name]) return null;
@@ -18,31 +18,31 @@
     }
   }
   return b;
-}
+};
 =

 Seam.getBeanType =3D function(obj) {
   for (var b in Seam.beans) {
     if (obj instanceof Seam.beans[b]) return Seam.beans[b];
   }
   return undefined;
-}
+};
 =

 Seam.getBeanName =3D function(obj) {
   var t =3D Seam.getBeanType(obj);
   return t ? t.__name : undefined;
-}
+};
 =

 Seam.isBeanRegistered =3D function(name) {
   return Seam.beans[name] !=3D null;
-}
+};
 =

 Seam.createSetterMethod =3D function(fieldName) {
   return function(value) { this[fieldName] =3D value; }; =

-}
+};
 =

 Seam.createGetterMethod =3D function(fieldName) {
   return function() { return this[fieldName]; }; =

-}
+};
 =

 Seam.registerBean =3D function(name, metadata, methods) {
   if (Seam.isBeanRegistered(name)) return;
@@ -72,7 +72,7 @@
     }
   }
   Seam.beans[name] =3D t;
-}
+};
 =

 Seam.importBeans =3D function() {
   var names =3D [];
@@ -95,7 +95,7 @@
   var envelope =3D Seam.createEnvelope(Seam.createHeader(c.id), c.data);
   Seam.pendingCalls.put(c.id, c);
   Seam.sendAjaxRequest(envelope, Seam.PATH_EXECUTE, Seam.processResponse, =
false);
-}
+};
 =

 Seam.createImportBeansCall =3D function(names, callback, originalCall) {
   var n =3D "org.jboss.seam.remoting.BeanMetadata";
@@ -108,12 +108,12 @@
   c.handler =3D Seam.processImportBeansResponse;
   if (originalCall) c.originalCall =3D originalCall;
   return c;  =

-}
+};
 =

 Seam.getBeanMetadata =3D function(obj) {
   var b =3D Seam.getBeanType(obj);
   return b ? b.__metadata : undefined;
-}
+};
 =

 Seam.Xml =3D {
   childNode: function(e, tag) {
@@ -128,7 +128,7 @@
     }
     return n;
   }
-}
+};
 =

 Seam.extractEncodedSessionId =3D function(url) {
   if (url.indexOf(';jsessionid=3D') >=3D 0) {
@@ -136,7 +136,7 @@
     return url.substring(url.indexOf(';jsessionid=3D') + 12, qpos >=3D 0 ?=
 qpos : url.length);
   }
   return null;
-}
+};
 =

 Seam.encodedSessionId =3D Seam.extractEncodedSessionId(window.location.hre=
f);
 =

@@ -155,16 +155,16 @@
   if (Seam.debugWindow) {
     Seam.debugWindow.document.write("<pre>" + (new Date()) + ": " + msg.re=
place(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;") + "</pre><=
br/>");
   }
-}
+};
 =

 Seam.Context =3D function() {
   this.conversationId =3D null;
   this.callId =3D null;
-  Seam.Context.prototype.setConversationId =3D function(conversationId) { =
this.conversationId =3D conversationId; }
-  Seam.Context.prototype.getConversationId =3D function() { return this.co=
nversationId; }
-  Seam.Context.prototype.setCallId =3D function(callId) { this.callId =3D =
callId; }
-  Seam.Context.prototype.getCallId =3D function() { return this.callId; }
-}
+  Seam.Context.prototype.setConversationId =3D function(conversationId) { =
this.conversationId =3D conversationId; };
+  Seam.Context.prototype.getConversationId =3D function() { return this.co=
nversationId; };
+  Seam.Context.prototype.setCallId =3D function(callId) { this.callId =3D =
callId; };
+  Seam.Context.prototype.getCallId =3D function() { return this.callId; };
+};
 Seam.context =3D new Seam.Context();
 =

 Seam.Exception =3D function(msg) {
@@ -172,44 +172,50 @@
   Seam.Exception.prototype.getMessage =3D function() {
     return this.message;
   }
-}
+};
 =

 Seam.equals =3D function(v1, v2) {
   if (v1 =3D=3D v2) return true;
   if (v1 instanceof Date && v2 instanceof Date &&
       v1.getTime() =3D=3D v2.getTime()) return true;
   return false;
-}
+};
 =

 Seam.Map =3D function() {
   this.elements =3D [];
+
   Seam.Map.prototype.size =3D function() {
     return this.elements.length;
-  }
+  };
+  =

   Seam.Map.prototype.isEmpty =3D function() {
     return this.elements.length =3D=3D 0;
-  }
+  };
+  =

   Seam.Map.prototype.keySet =3D function() {
     var keySet =3D [];
     for (var i=3D0; i<this.elements.length; i++) {
       keySet[keySet.length] =3D this.elements[i].key;
     }
     return keySet;
-  }
+  };
+  =

   Seam.Map.prototype.values =3D function() {
     var vals =3D [];
     for (var i=3D0; i<this.elements.length; i++) {
       vals.push(this.elements[i].value);
     }
     return vals;
-  }
+  };
+  =

   Seam.Map.prototype.get =3D function(key) {
     for (var i=3D0; i<this.elements.length; i++) {
       var e =3D this.elements[i];
       if (Seam.equals(e.key, key)) return e.value;
     }
     return null;
-  }
+  };
+  =

   Seam.Map.prototype.put =3D function(key, value) {
     for (var i=3D0; i<this.elements.length; i++) {
       if (Seam.equals(this.elements[i].key, key)) {
@@ -218,7 +224,8 @@
       }
     }
     this.elements.push({key:key,value:value});
-  }
+  };
+  =

   Seam.Map.prototype.remove =3D function(key) {
     for (var i=3D0; i<this.elements.length; i++) {
       if (Seam.equals(this.elements[i].key, key)) {
@@ -226,14 +233,15 @@
         break;
       }
     }
-  }
+  };
+  =

   Seam.Map.prototype.contains =3D function(key) {
     for (var i=3D0; i<this.elements.length; i++) {
       if (Seam.equals(this.elements[i].key, key)) return true;
     }
     return false;
-  }
-}
+  };
+};
 =

 Seam.serializeValue =3D function(v, type, refs) {
   if (v =3D=3D null) return "<null/>";
@@ -266,7 +274,7 @@
         return "<str>" + encodeURIComponent(v) + "</str>";
     }
   }
-}
+};
 =

 Seam.serializeBag =3D function(v, refs) {
   var d =3D "<bag>";
@@ -275,7 +283,7 @@
   }
   d +=3D "</bag>";
   return d;
-}
+};
 =

 Seam.serializeMap =3D function(v, refs) {
   var d =3D "<map>";
@@ -286,14 +294,14 @@
   }
   d +=3D "</map>";
   return d;
-}
+};
 =

 Seam.serializeDate =3D function(v) {
   var zeroPad =3D function(val, digits) { while (("" + val).length < digit=
s) val =3D "0" + val; return val; };
   return "<date>" + v.getFullYear() + zeroPad(v.getMonth() + 1, 2) + zeroP=
ad(v.getDate(), 2) +
     zeroPad(v.getHours(), 2) + zeroPad(v.getMinutes(), 2) + zeroPad(v.getS=
econds(), 2) +
     zeroPad(v.getMilliseconds(), 3) +"</date>";
-}
+};
 =

 Seam.getTypeRef =3D function(obj, refs) {
   var refId =3D -1;
@@ -308,7 +316,7 @@
     refs[refId] =3D obj;
   }
   return "<ref id=3D\"" + refId + "\"/>";
-}
+};
 =

 Seam.serializeType =3D function(obj, refs) {
   var t =3D Seam.getBeanType(obj);
@@ -324,7 +332,7 @@
   }
   d +=3D "</bean>";
   return d;
-}
+};
 =

 Seam.createCall =3D function(component, methodName, params, callback, exce=
ptionHandler) {
   var callId =3D "" + Seam.__callId++;
@@ -349,7 +357,7 @@
   }
   d +=3D "</refs></call>";
   return {data: d, id: callId, callback: callback, exceptionHandler: excep=
tionHandler, handler: Seam.preProcessCallResponse};
-}
+};
 =

 Seam.createHeader =3D function(callId) {
   var h =3D "<context><callId>" + callId + "</callId>";
@@ -358,7 +366,7 @@
   }
   h +=3D "</context>";
   return h;
-}
+};
 =

 Seam.createEnvelope =3D function(header, body) {
   var d =3D "<envelope>";
@@ -366,7 +374,7 @@
   if (body) d +=3D "<body>" + body + "</body>";
   d +=3D "</envelope>";
   return d;
-}
+};
 =

 Seam.__callId =3D 0;
 Seam.pendingCalls =3D new Seam.Map();
@@ -381,7 +389,7 @@
     }, 0);
     c.asyncReq.abort();
   }
-}
+};
 =

 Seam.execute =3D function(component, methodName, params, callback, excepti=
onHandler) {
   var c =3D Seam.createCall(component, methodName, params, callback, excep=
tionHandler);
@@ -389,7 +397,7 @@
   Seam.pendingCalls.put(c.id, c);
   Seam.sendAjaxRequest(envelope, Seam.PATH_EXECUTE, Seam.processResponse, =
false);
   return c;
-}
+};
 =

 Seam.sendAjaxRequest =3D function(env, path, callback, silent) {
   Seam.log("Request packet:\n" + env);
@@ -439,13 +447,13 @@
         Seam.displayError(r.status);
       }
     }
-  }
+  };
   if (Seam.encodedSessionId) {
     path +=3D ';jsessionid=3D' + Seam.encodedSessionId;
   }
   r.open("POST", Seam.resourcePath + path, true);
   r.send(env);
-}
+};
 =

 Seam.processImportBeansResponse =3D function(call) {   =

   var cn =3D Seam.Xml.childNode;
@@ -483,7 +491,7 @@
       call.originalCall.handler(call.originalCall);
     }
   }
-}
+};
 =

 Seam.preProcessCallResponse =3D function(call) {
   var cn =3D Seam.Xml.childNode;
@@ -504,7 +512,7 @@
       }
     }
   }
-}
+};
 =

 Seam.processCallResponse =3D function(call) {
   var cn =3D Seam.Xml.childNode;
@@ -522,7 +530,7 @@
     var v =3D Seam.unmarshalValue(valueNode.firstChild, refs);
     call.callback(v, call.context);
   }
-}
+};
 =

 Seam.preProcessModelResponse =3D function(call) {
   var cn =3D Seam.Xml.childNode;
@@ -543,7 +551,7 @@
       }
     }
   }  =

-}
+};
 =

 Seam.preProcessModelExpandResponse =3D function(call) {
   var cn =3D Seam.Xml.childNode; =

@@ -564,7 +572,7 @@
       }
     }
   } =

-}
+};
 =

 Seam.processModelExpandResponse =3D function(call) {
   Seam.pendingCalls.remove(call.callId);
@@ -574,7 +582,7 @@
     var n =3D cn(b, "model");
     if (call.model) call.model.processExpandResponse(n, call.refId, call.p=
roperty, call.callback);
   }
-}
+};
 =

 Seam.processModelResponse =3D function(call) {
   Seam.pendingCalls.remove(call.callId);
@@ -584,15 +592,15 @@
     var n =3D cn(b, "model");
     if (call.model) call.model.processResponse(n, call.callback);  =

   }
-}
+};
 =

 Seam.displayError =3D function(code) {
   alert("There was an error processing your request.  Error code: " + code=
);
-}
+};
 =

 Seam.setCallback =3D function(component, methodName, callback) {
   component.__callback[methodName] =3D callback;
-}
+};
 =

 Seam.processResponse =3D function(doc) {
   var cn =3D Seam.Xml.childNode;
@@ -613,14 +621,14 @@
       }
     }
   }
-}
+};
 =

 Seam.unmarshalContext =3D function(ctxNode, context) {
   var c =3D Seam.Xml.childNode(ctxNode, "conversationId");
   if (c) context.setConversationId(c.firstChild.nodeValue);
   c =3D Seam.Xml.childNode(ctxNode, "callId");
   if (c) context.setCallId(c.firstChild.nodeValue);
-}
+};
 =

 Seam.validateRefs =3D function(refsNode) {
   var unknowns =3D [];
@@ -635,7 +643,7 @@
     }
   }
   return unknowns;
-}
+};
 =

 Seam.unmarshalRefs =3D function(refsNode, refs) {
   if (!refsNode) return;
@@ -664,7 +672,7 @@
     }
   }
   return refs;
-}
+};
 =

 Seam.unmarshalValue =3D function(element, refs) {
   switch (element.tagName) {
@@ -702,7 +710,7 @@
     case "undefined": return undefined;
     default: return null;
   }
-}
+};
 =

 Seam.cloneObject =3D function(obj, refMap) {
   if (refMap && refMap.contains(obj)) return refMap.get(obj);
@@ -726,7 +734,7 @@
     return c;
   }
   return obj;
-}
+};
 =

 Seam.deserializeDate =3D function(val) {
   var d =3D new Date();
@@ -738,7 +746,7 @@
   d.setSeconds(parseInt(val.substring(12,14), 10));
   d.setMilliseconds(parseInt(val.substring(14,17), 10));
   return d;
-}
+};
 =

 Seam.loadingMsgDiv =3D null;
 Seam.loadingMessage =3D "Please wait...";
@@ -764,11 +772,11 @@
     Seam.loadingMsgDiv.innerHTML =3D Seam.loadingMessage;
     Seam.loadingMsgDiv.style.visibility =3D 'visible';
   }
-}
+};
 =

 Seam.hideLoadingMessage =3D function() {
   if (Seam.loadingMsgDiv) Seam.loadingMsgDiv.style.visibility =3D 'hidden';
-}
+};
 =

 Seam.Action =3D function() {
   this.beanType =3D null;
@@ -776,34 +784,39 @@
   this.method =3D null;
   this.params =3D [];
   this.expression =3D null;
+  =

   Seam.Action.prototype.setBeanType =3D function(beanType) {
     this.beanType =3D beanType;
     return this;
-  }
+  };
+  =

   Seam.Action.prototype.setQualifiers =3D function(qualifiers) {
     this.qualifiers =3D qualifiers;
     return this;
-  }
+  };
+  =

   Seam.Action.prototype.setMethod =3D function(method) {
     this.method =3D method;
     return this;
-  }
+  };
+  =

   Seam.Action.prototype.addParam =3D function(param) {
     this.params.push(param);
     return this;
-  }
+  };
+  =

   Seam.Action.prototype.setExpression =3D function(expr) {
     this.expression =3D expr;
     return this;
-  }
-}
+  };
+};
 =

 Seam.Changeset =3D function() {
   this.propertyChange =3D new Seam.Map();
   Seam.Changeset.prototype.addProperty =3D function(name, val) {
     this.propertyChange.put(name, val);
-  }
-}
+  };
+};
 =

 Seam.Delta =3D function(model) {
   this.model =3D model;
@@ -843,7 +856,7 @@
         }
     }
     return false;
-  }
+  };
 =

   Seam.Delta.prototype.registerPropertyChange =3D function(obj, prop) {
     var cs =3D this.refs.get(obj);
@@ -852,7 +865,7 @@
       this.refs.put(obj, cs);
     }
     cs.addProperty(prop, obj[prop]);
-  }
+  };
 =

   Seam.Delta.prototype.scanForChanges =3D function(obj) {
     if (obj =3D=3D null || this.refs.contains(obj)) return;
@@ -886,14 +899,14 @@
         }
       }
     }
-  }
+  };
 =

   Seam.Delta.prototype.getSourceObject =3D function(obj) {
     for (var i=3D0;i<this.model.workingRefs.length; i++) {
       if (obj =3D=3D this.model.workingRefs[i]) return this.model.sourceRe=
fs[i];
     }
     return null;
-  }
+  };
 =

   Seam.Delta.prototype.buildRefs =3D function() {
     var refs =3D [];
@@ -901,8 +914,8 @@
       refs.push(this.refs.elements[i]);
     }
     return refs;
-  }
-}
+  };
+};
 =

 Seam.Model =3D function() {
   this.id =3D null;
@@ -914,7 +927,7 @@
 =

   Seam.Model.prototype.addExpression =3D function(alias, expr) {
     this.expressions.push({alias: alias, expr: expr});
-  }
+  };
 =

   Seam.Model.prototype.getValue =3D function(alias) {
     for (var i=3D0; i<this.values.length; i++) {
@@ -923,7 +936,7 @@
       }
     }
     return null;
-  }
+  };
 =

   Seam.Model.prototype.addBean =3D function(alias, bean) {
     var q =3D null;
@@ -934,7 +947,7 @@
       }
     }
     this.beans.push({alias: alias, bean: bean, qualifiers: q});
-  }
+  };
 =

   Seam.Model.prototype.addBeanProperty =3D function(alias, bean, property)=
 {
     var q =3D null;
@@ -945,14 +958,14 @@
       }
     }
     this.beans.push({alias: alias, bean: bean, property: property, qualifi=
ers: q});
-  }
+  };
 =

   Seam.Model.prototype.fetch =3D function(action, cb) {
     var r =3D this.createFetchRequest(action, cb);
     var env =3D Seam.createEnvelope(Seam.createHeader(r.id), r.data);
     Seam.pendingCalls.put(r.id, r);
     Seam.sendAjaxRequest(env, Seam.PATH_MODEL, Seam.processResponse, false=
);
-  }
+  };
 =

   Seam.Model.prototype.createFetchRequest =3D function(a, cb) {
     var callId =3D "" + Seam.__callId++;
@@ -1006,7 +1019,7 @@
     }
     d +=3D "</model>";
     return {data:d, id:callId, model:this, handler: Seam.preProcessModelRe=
sponse, callback: cb};
-  }
+  };
 =

   Seam.Model.prototype.processResponse =3D function(modelNode, cb) {
     var refsNode =3D Seam.Xml.childNode(modelNode, "refs");
@@ -1019,7 +1032,7 @@
       this.values.push({alias:valueNodes[i].getAttribute("alias"),value:va=
lue, refIndex:i});
     }
     if (cb) cb(this);
-  }
+  };
 =

   Seam.Model.prototype.applyUpdates =3D function(a, cb) {
     var d =3D new Seam.Delta(this);
@@ -1030,7 +1043,7 @@
     var env =3D Seam.createEnvelope(Seam.createHeader(r.id), r.data);
     Seam.pendingCalls.put(r.id, r);
     Seam.sendAjaxRequest(env, Seam.PATH_MODEL, Seam.processResponse, false=
);
-  }
+  };
 =

   Seam.Model.prototype.createApplyRequest =3D function(a, delta, cb) {
     var callId =3D "" + Seam.__callId++;
@@ -1086,14 +1099,14 @@
     }
     d +=3D "</model>";
     return {data:d, id:callId, model:this, handler: Seam.preProcessModelRe=
sponse, callback: cb};
-  }
+  };
 =

   Seam.Model.prototype.getRefId =3D function(v) {
     for (var i=3D0; i<this.workingRefs.length; i++) {
       if (this.workingRefs[i] =3D=3D v) return i;
     }
     return -1;
-  }
+  };
   =

   Seam.Model.prototype.expand =3D function(v, p, cb) {
     if (v[p] !=3D undefined) return;
@@ -1102,14 +1115,14 @@
     var env =3D Seam.createEnvelope(Seam.createHeader(r.id), r.data);
     Seam.pendingCalls.put(r.id, r);
     Seam.sendAjaxRequest(env, Seam.PATH_MODEL, Seam.processResponse, false=
);
-  }
+  };
 =

   Seam.Model.prototype.createExpandRequest =3D function(refId, propName, c=
b) {
     var callId =3D "" + Seam.__callId++;
     var d =3D "<model id=3D\"" + this.id + "\" operation=3D\"expand\">" +
       "<ref id=3D\"" + refId + "\"><member name=3D\"" + propName + "\"/></=
ref></model>";
     return {data: d, id: callId, model: this, refId: refId, property: prop=
Name, handler: Seam.preProcessModelExpandResponse, callback: cb};
-  }
+  };
 =

   Seam.Model.prototype.processExpandResponse =3D function(modelNode, refId=
, propName, cb) {
     var refsNode =3D Seam.Xml.childNode(modelNode, "refs");
@@ -1119,5 +1132,5 @@
     this.sourceRefs[refId][propName] =3D Seam.unmarshalValue(resultNode.fi=
rstChild,this.sourceRefs);
     this.workingRefs[refId][propName] =3D Seam.unmarshalValue(resultNode.f=
irstChild,this.workingRefs);
     if (cb) cb(this);
-  }
-}
\ No newline at end of file
+  };
+};
\ No newline at end of file


--===============0140795194521756241==--