From seam-commits at lists.jboss.org Wed Dec 30 05:42:55 2009
Content-Type: multipart/mixed; boundary="===============2668170353838548208=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r11892 - in modules/remoting/trunk:
 src/main/java/org/jboss/seam/remoting and 2 other directories.
Date: Wed, 30 Dec 2009 05:42:55 -0500
Message-ID: <200912301042.nBUAgtAH028400@svn01.web.mwc.hst.phx2.redhat.com>

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

Author: shane.bryzak(a)jboss.com
Date: 2009-12-30 05:42:54 -0500 (Wed, 30 Dec 2009)
New Revision: 11892

Modified:
   modules/remoting/trunk/examples/model/src/main/webapp/model.html
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Call.java
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/ExecutionHa=
ndler.java
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/MarshalUtil=
s.java
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/RequestCont=
ext.java
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/RequestHand=
ler.java
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/Model=
.java
   modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/Model=
Handler.java
   modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote=
.js
Log:
rewrite call handling, removed support for batch requests


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	2009-1=
2-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/examples/model/src/main/webapp/model.html	2009-1=
2-30 10:42:54 UTC (rev 11892)
@@ -11,7 +11,6 @@
   <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/interface=
.js?org.jboss.seam.remoting.examples.model.Customer"></script>
   =

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

     //<![CDATA[

Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Call=
.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/Call.java	=
2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Call.java	=
2009-12-30 10:42:54 UTC (rev 11892)
@@ -31,8 +31,6 @@
    =

    private BeanManager beanManager;
 =

-   private String id;
-
    private String methodName;
    private Throwable exception;
 =

@@ -46,11 +44,9 @@
    =

    private Bean<?> targetBean =3D null;
 =

-   public Call(BeanManager beanManager, String id, String beanName, =

-         String qualifiers, String methodName)
+   public Call(BeanManager beanManager, String beanName, String qualifiers=
, String methodName)
    {
       this.beanManager =3D beanManager;
-      this.id =3D id;
       this.methodName =3D methodName;
       this.context =3D new CallContext(beanManager);
       =

@@ -134,16 +130,6 @@
    }
 =

    /**
-    * Returns the id of this call.
-    * =

-    * @return String
-    */
-   public String getId()
-   {
-      return id;
-   }
-
-   /**
     * Returns the object graph constraints annotated on the method that is
     * called.
     * =


Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Exec=
utionHandler.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/ExecutionH=
andler.java	2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/ExecutionH=
andler.java	2009-12-30 10:42:54 UTC (rev 11892)
@@ -4,9 +4,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 =

 import javax.enterprise.context.Conversation;
 import javax.enterprise.inject.spi.BeanManager;
@@ -76,19 +74,14 @@
       }
 =

       // Extract the calls from the request
-      List<Call> calls =3D unmarshalCalls(env);
+      Call call =3D unmarshalCall(env);
+      call.execute();
 =

-      // Execute each of the calls
-      for (Call call : calls)
-      {
-         call.execute();
-      }
-
       // Store the conversation ID in the outgoing context
       ctx.setConversationId(conversation.getId());
 =

       // Package up the response
-      marshalResponse(calls, ctx, response.getOutputStream());
+      marshalResponse(call, ctx, response.getOutputStream());
    }
 =

    /**
@@ -99,57 +92,49 @@
     * @throws Exception
     */
    @SuppressWarnings("unchecked")
-   private List<Call> unmarshalCalls(Element env) throws Exception
+   private Call unmarshalCall(Element env) throws Exception
    {
       try
       {
-         List<Call> calls =3D new ArrayList<Call>();
+         Element callElement =3D env.element("body").element("call");
+  =

+         Element targetNode =3D callElement.element("target");
+         Element qualifiersNode =3D callElement.element("qualifiers");
+         Element methodNode =3D callElement.element("method");
+         =

+         Call call =3D new Call(beanManager, targetNode.getText(), =

+               qualifiersNode !=3D null ? qualifiersNode.getText() : null, =

+               methodNode.getText());
 =

-         List<Element> callElements =3D env.element("body").elements("call=
");
+         // First reconstruct all the references
+         Element refsNode =3D callElement.element("refs");
+         =

+         Iterator iter =3D refsNode.elementIterator("ref");
+         while (iter.hasNext())
+         {
+            call.getContext()
+                  .createWrapperFromElement((Element) iter.next());
+         }
 =

-         for (Element e : callElements)
-         {           =

-            Element targetNode =3D e.element("target");
-            Element qualifiersNode =3D e.element("qualifiers");
-            Element methodNode =3D e.element("method");
-            =

-            Call call =3D new Call(beanManager, e.attributeValue("id"), =

-                  targetNode.getText(), =

-                  qualifiersNode !=3D null ? qualifiersNode.getText() : nu=
ll, =

-                  methodNode.getText());
+         // Now unmarshal the ref values
+         for (Wrapper w : call.getContext().getInRefs().values())
+         {
+            w.unmarshal();
+         }
 =

-            // First reconstruct all the references
-            Element refsNode =3D e.element("refs");
-            =

-            Iterator iter =3D refsNode.elementIterator("ref");
-            while (iter.hasNext())
-            {
-               call.getContext()
-                     .createWrapperFromElement((Element) iter.next());
-            }
+         Element paramsNode =3D callElement.element("params");
 =

-            // Now unmarshal the ref values
-            for (Wrapper w : call.getContext().getInRefs().values())
-            {
-               w.unmarshal();
-            }
+         // Then process the param values
+         iter =3D paramsNode.elementIterator("param");
+         while (iter.hasNext())
+         {
+            Element param =3D (Element) iter.next();
 =

-            Element paramsNode =3D e.element("params");
-
-            // Then process the param values
-            iter =3D paramsNode.elementIterator("param");
-            while (iter.hasNext())
-            {
-               Element param =3D (Element) iter.next();
-
-               call.addParameter(call.getContext().createWrapperFromElemen=
t(
-                     (Element) param.elementIterator().next()));
-            }
-
-            calls.add(call);
+            call.addParameter(call.getContext().createWrapperFromElement(
+                  (Element) param.elementIterator().next()));
          }
 =

-         return calls;
+         return call;
       }
       catch (Exception ex)
       {
@@ -167,29 +152,27 @@
     *           OutputStream The stream to write to
     * @throws IOException
     */
-   private void marshalResponse(List<Call> calls, RequestContext ctx,
-         OutputStream out) throws IOException
+   private void marshalResponse(Call call, RequestContext ctx, OutputStrea=
m out) =

+      throws IOException
    {
       out.write(ENVELOPE_TAG_OPEN);
-
+      out.write(HEADER_OPEN);
+      out.write(CONTEXT_TAG_OPEN);
       if (ctx.getConversationId() !=3D null)
       {
-         out.write(HEADER_OPEN);
-         out.write(CONTEXT_TAG_OPEN);
          out.write(CONVERSATION_ID_TAG_OPEN);
          out.write(ctx.getConversationId().getBytes());
          out.write(CONVERSATION_ID_TAG_CLOSE);
-         out.write(CONTEXT_TAG_CLOSE);
-         out.write(HEADER_CLOSE);
       }
+      out.write(CALL_ID_TAG_OPEN);
+      out.write(ctx.getCallId().toString().getBytes());
+      out.write(CALL_ID_TAG_CLOSE);
+      out.write(CONTEXT_TAG_CLOSE);
+      out.write(HEADER_CLOSE);
 =

       out.write(BODY_TAG_OPEN);
+      MarshalUtils.marshalCallResult(call, out);
 =

-      for (Call call : calls)
-      {
-         MarshalUtils.marshalCallResult(call, out);
-      }
-
       out.write(BODY_TAG_CLOSE);
       out.write(ENVELOPE_TAG_CLOSE);
       out.flush();

Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Mars=
halUtils.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/MarshalUti=
ls.java	2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/MarshalUti=
ls.java	2009-12-30 10:42:54 UTC (rev 11892)
@@ -15,8 +15,6 @@
  */
 public class MarshalUtils
 {
-   private static final byte[] RESULT_TAG_OPEN_START =3D "<result id=3D\""=
.getBytes();
-   private static final byte[] RESULT_TAG_OPEN_END =3D "\">".getBytes();
    private static final byte[] RESULT_TAG_OPEN =3D "<result>".getBytes();
    private static final byte[] RESULT_TAG_CLOSE =3D "</result>".getBytes();
    =

@@ -40,16 +38,7 @@
    public static void marshalCallResult(Call call, OutputStream out)
          throws IOException
    {
-      if (call.getId() !=3D null)
-      {
-         out.write(RESULT_TAG_OPEN_START);
-         out.write(call.getId().getBytes());
-         out.write(RESULT_TAG_OPEN_END);
-      }
-      else
-      {
-         out.write(RESULT_TAG_OPEN);
-      }
+      out.write(RESULT_TAG_OPEN);
 =

       if (call.getException() !=3D null)
       {
@@ -84,14 +73,7 @@
       throws IOException
    {
       out.write(MODEL_TAG_OPEN_START);
-      out.write(model.getId().getBytes());
-      =

-      if (model.getCallId() !=3D null)
-      {
-         out.write("\" callId=3D\"".getBytes());
-         out.write(model.getCallId().getBytes());
-      }
-      =

+      out.write(model.getId().getBytes());      =

       out.write(MODEL_TAG_OPEN_END);
       =

       for (String alias : model.getBeanProperties().keySet())

Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Requ=
estContext.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/RequestCon=
text.java	2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/RequestCon=
text.java	2009-12-30 10:42:54 UTC (rev 11892)
@@ -20,11 +20,17 @@
             {
                setConversationId(convId.getText());
             }
+            Element callId =3D context.element("callId");
+            if (callId !=3D null)
+            {
+               setCallId(Long.valueOf(callId.getText()));
+            }
          }
       }
    }
    =

   private String conversationId;
+  private Long callId;
 =

   public String getConversationId()
   {
@@ -35,4 +41,14 @@
   {
     this.conversationId =3D conversationId;
   }
+  =

+  public Long getCallId()
+  {
+     return callId;
+  }
+  =

+  public void setCallId(Long callId)
+  {
+     this.callId =3D callId;
+  }
 }

Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/Requ=
estHandler.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/RequestHan=
dler.java	2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/RequestHan=
dler.java	2009-12-30 10:42:54 UTC (rev 11892)
@@ -18,15 +18,12 @@
   static final byte[] REF_TAG_OPEN_START =3D "<ref id=3D\"".getBytes();
   static final byte[] REF_TAG_OPEN_END =3D "\">".getBytes();
   static final byte[] REF_TAG_CLOSE =3D "</ref>".getBytes();
-  =

-  =

   static final byte[] HEADER_OPEN =3D "<header>".getBytes();
   static final byte[] HEADER_CLOSE =3D "</header>".getBytes();
-  static final byte[] CONVERSATION_ID_TAG_OPEN =3D "<conversationId>"
-        .getBytes();
-  static final byte[] CONVERSATION_ID_TAG_CLOSE =3D "</conversationId>"
-        .getBytes();
-
+  static final byte[] CONVERSATION_ID_TAG_OPEN =3D "<conversationId>".getB=
ytes();
+  static final byte[] CONVERSATION_ID_TAG_CLOSE =3D "</conversationId>".ge=
tBytes();
+  static final byte[] CALL_ID_TAG_OPEN =3D "<callId>".getBytes();
+  static final byte[] CALL_ID_TAG_CLOSE =3D "</callId>".getBytes();
   static final byte[] CONTEXT_TAG_OPEN =3D "<context>".getBytes();
   static final byte[] CONTEXT_TAG_CLOSE =3D "</context>".getBytes();   =

 =


Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/mode=
l/Model.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/model/Mode=
l.java	2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/Mode=
l.java	2009-12-30 10:42:54 UTC (rev 11892)
@@ -31,7 +31,6 @@
    =

    private BeanManager beanManager;
    private String id;
-   private String callId;
    private CallContext callContext;
    private Call action;
    =

@@ -121,17 +120,7 @@
       callContext =3D new CallContext(beanManager);
       beanProperties =3D new HashMap<String, BeanProperty>();
    }
-   =

-   public void setCallId(String callId)
-   {
-      this.callId =3D callId;
-   }
-   =

-   public String getCallId()
-   {
-      return callId;
-   }
-   =

+     =

    /**
     * Evaluate each of the model's bean properties, expressions, etc and
     * store the values in the BeanProperty map.

Modified: modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/mode=
l/ModelHandler.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/model/Mode=
lHandler.java	2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/java/org/jboss/seam/remoting/model/Mode=
lHandler.java	2009-12-30 10:42:54 UTC (rev 11892)
@@ -93,15 +93,14 @@
          for (Element modelElement : (List<Element>) env.element("body").e=
lements("model"))
          {     =

             String operation =3D modelElement.attributeValue("operation");
-            String callId =3D modelElement.attributeValue("callId");
             =

             if ("fetch".equals(operation))
             {
-               processFetchRequest(modelElement, models, callId);
+               processFetchRequest(modelElement, models);
             }
             else if ("apply".equals(operation))
             {
-               processApplyRequest(modelElement, models, callId);
+               processApplyRequest(modelElement, models);
             }
          }
    =

@@ -140,16 +139,15 @@
    }
    =

    @SuppressWarnings({ "unchecked" }) =

-   private void processFetchRequest(Element modelElement, Set<Model> model=
s, String callId)
+   private void processFetchRequest(Element modelElement, Set<Model> model=
s)
       throws Exception
    {
       Model model =3D registry.createModel();
-      models.add(model);
-      model.setCallId(callId);           =

+      models.add(model); =

       =

       if (modelElement.elements("action").size() > 0)
       {         =

-         unmarshalAction(modelElement.element("action"), model, callId);
+         unmarshalAction(modelElement.element("action"), model);
       }
       =

       for (Element beanElement : (List<Element>) modelElement.elements("be=
an"))
@@ -177,7 +175,7 @@
    }
    =

    @SuppressWarnings("unchecked")
-   private void unmarshalAction(Element actionElement, Model model, String=
 callId)
+   private void unmarshalAction(Element actionElement, Model model)
    {
       Element targetElement =3D actionElement.element("target");
       Element qualifiersElement =3D actionElement.element("qualifiers");
@@ -185,7 +183,7 @@
       Element paramsElement =3D actionElement.element("params");
       Element refsElement =3D actionElement.element("refs");
       =

-      model.setAction(new Call(beanManager, callId, targetElement.getTextT=
rim(), =

+      model.setAction(new Call(beanManager, targetElement.getTextTrim(), =

            qualifiersElement !=3D null ? qualifiersElement.getTextTrim() :=
 null, =

            methodElement !=3D null ? methodElement.getTextTrim() : null));=
                        =

 =

@@ -213,12 +211,11 @@
    }
    =

    @SuppressWarnings("unchecked")
-   private void processApplyRequest(Element modelElement, Set<Model> model=
s, String callId)
+   private void processApplyRequest(Element modelElement, Set<Model> model=
s)
       throws Exception
    {
       Model model =3D registry.getModel(modelElement.attributeValue("uid")=
);
       models.add(model);
-      model.setCallId(callId); =

       model.setAction(null);
       =

       CallContext ctx =3D new CallContext(beanManager);
@@ -253,7 +250,7 @@
       =

       if (modelElement.elements("action").size() > 0)
       {         =

-         unmarshalAction(modelElement.element("action"), model, callId);
+         unmarshalAction(modelElement.element("action"), model);
       }      =

       =

       if (model.getAction() !=3D null)

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	2009-12-29 09:13:05 UTC (rev 11891)
+++ modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remot=
e.js	2009-12-30 10:42:54 UTC (rev 11892)
@@ -70,14 +70,40 @@
   var names =3D [];
   var cb =3D null;
   for (var i=3D0; i<arguments.length; i++) {
-    if (typeof arguments[i] !=3D "function")
-      names.push(arguments[i]);
-    else
-      cb =3D arguments[i];
+    if (typeof arguments[i] !=3D "function") {
+      if (arguments[i] instanceof Array) {
+        for (var j=3D0; j<arguments[i].length; j++) {
+          names.push(arguments[i][j]);
+        } =

+      } else {           =

+        names.push(arguments[i]);
+      }
+    } else {
+        cb =3D arguments[i];
+    }
   }
   var n =3D "org.jboss.seam.remoting.BeanMetadata";
   if (!Seam.isBeanRegistered(n)) Seam.registerBean(n, {name: "str", method=
s: "Seam.Map", properties: "Seam.Map"});
-  Seam.execute("org.jboss.seam.remoting.MetadataCache", "loadBeans", [name=
s], cb);
+  var callback =3D function(beans) {
+    for (var i=3D0; i<beans.length; i++) {
+      var meta =3D beans[i]; =

+      if (meta.beanType =3D=3D "state") {
+        var props =3D {};
+        for (var j=3D0;j<meta.properties.elements.length; j++) {
+          props[meta.properties.elements[j].key] =3D meta.properties.eleme=
nts[j].value;
+        }
+        Seam.registerBean(meta.name, props);
+      } else if (meta.beanType =3D=3D "action") {
+        var methods =3D {};
+        for (var j=3D0; j<meta.methods.elements.length; j++) {
+          methods[meta.methods.elements[j].key] =3D meta.methods.elements[=
j].value;
+        }
+        Seam.registerBean(meta.name, null, methods);
+      }
+    } =

+    if (cb) cb();
+  }
+  Seam.execute("org.jboss.seam.remoting.MetadataCache", "loadBeans", [name=
s], callback);
 }
 =

 Seam.getBeanMetadata =3D function(obj) {
@@ -129,13 +155,11 @@
 =

 Seam.Context =3D function() {
   this.conversationId =3D null;
-  Seam.Context.prototype.setConversationId =3D function(conversationId) {
-    this.conversationId =3D conversationId;
-  }
-
-  Seam.Context.prototype.getConversationId =3D function() {
-    return this.conversationId;
-  }
+  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 =3D new Seam.Context();
 =

@@ -301,8 +325,7 @@
 Seam.createCall =3D function(component, methodName, params, callback, exce=
ptionHandler) {
   var callId =3D "" + Seam.__callId++;
   if (!callback) callback =3D component.__callback[methodName];
-  var d =3D "<call id=3D\"" + callId + "\">\n" +
-    "<target>" + Seam.getBeanType(component).__name + "</target>";
+  var d =3D "<call><target>" + Seam.getBeanType(component).__name + "</tar=
get>";
   if (component.__qualifiers !=3D null) {
     d +=3D "<qualifiers>";
     for (var i=3D0; i<component.__qualifiers.length; i++) {
@@ -311,7 +334,7 @@
     }
     d +=3D "</qualifiers>";
   }
-  d +=3D "<method>" + methodName + "</method>" + "<params>";
+  d +=3D "<method>" + methodName + "</method><params>";
   var refs =3D [];
   for (var i=3D0; i<params.length; i++) {
     d +=3D "<param>" + Seam.serializeValue(params[i], null, refs) + "</par=
am>";
@@ -321,11 +344,11 @@
     d +=3D "<ref id=3D\"" + i + "\">" + Seam.serializeType(refs[i], refs) =
+ "</ref>";
   }
   d +=3D "</refs></call>";
-  return {data: d, id: callId, callback: callback, exceptionHandler: excep=
tionHandler};
+  return {data: d, id: callId, callback: callback, exceptionHandler: excep=
tionHandler, handler: Seam.preProcessCallResponse};
 }
 =

-Seam.createHeader =3D function() {
-  var h =3D "<context>";
+Seam.createHeader =3D function(callId) {
+  var h =3D "<context><callId>" + callId + "</callId>";
   if (Seam.context.getConversationId()) {
     h +=3D "<conversationId>" + Seam.context.getConversationId() + "</conv=
ersationId>";
   }
@@ -343,34 +366,7 @@
 =

 Seam.__callId =3D 0;
 Seam.pendingCalls =3D new Seam.Map();
-Seam.inBatch =3D false;
-Seam.batchedCalls =3D [];
 =

-Seam.startBatch =3D function() {
-  Seam.inBatch =3D true;
-  Seam.batchedCalls.length =3D 0;
-}
-
-Seam.executeBatch =3D function() {
-  if (!Seam.inBatch) return;
-  var d =3D "";
-  for (var i=3D0; i<Seam.batchedCalls.length; i++) {
-    Seam.pendingCalls.put(Seam.batchedCalls[i].id, Seam.batchedCalls[i]);
-    d +=3D Seam.batchedCalls[i].data;
-  }
-  var envelope =3D Seam.createEnvelope(Seam.createHeader(), d);
-  Seam.batchAsyncReq =3D Seam.sendAjaxRequest(envelope, Seam.PATH_EXECUTE,
-    Seam.processResponse, false);
-  Seam.inBatch =3D false;
-}
-
-Seam.cancelBatch =3D function() {
-  Seam.inBatch =3D false;
-  for (var i=3D0; i<Seam.batchedCalls.length; i++) {
-    Seam.pendingCalls.remove(Seam.batchedCalls[i].id);
-  }
-}
-
 Seam.cancelCall =3D function(callId) {
   var c =3D Seam.pendingCalls.get(callId);
   Seam.pendingCalls.remove(callId);
@@ -386,9 +382,9 @@
 Seam.execute =3D function(component, methodName, params, callback, excepti=
onHandler) {
   var c =3D Seam.createCall(component, methodName, params, callback, excep=
tionHandler);
   if (Seam.inBatch) {
-    Seam.batchedCalls[Seam.batchedCalls.length] =3D c;
+    Seam.batchedCalls.push(c);
   } else {
-    var envelope =3D Seam.createEnvelope(Seam.createHeader(), c.data);
+    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);
   }
@@ -405,7 +401,6 @@
   } else {
     r =3D new ActiveXObject("Microsoft.XMLHTTP");
   }
-
   r.onreadystatechange =3D function() {
     if (r.readyState =3D=3D 4) {
       var inScope =3D typeof(Seam) =3D=3D "undefined" ? false : true;
@@ -452,6 +447,54 @@
   r.send(env);
 }
 =

+Seam.preProcessCallResponse =3D function(call) {
+  var cn =3D Seam.Xml.childNode;
+  var bodyNode =3D cn(call.response.documentElement, "body");
+  if (bodyNode) {
+    var n =3D cn(bodyNode, "result");
+    if (n) {
+      var refsNode =3D cn(n, "refs");
+      var u =3D Seam.validateRefs(refsNode, call);
+      if (u.length > 0) {
+        // todo load the unknown types        =

+      } else {
+        Seam.processCallResponse(call);
+      }
+    }
+  }
+}
+
+Seam.processCallResponse =3D function(call) {
+  var cn =3D Seam.Xml.childNode;
+  Seam.pendingCalls.remove(call.callId);
+  var n =3D cn(cn(call.response.documentElement, "body"), "result");
+  var valueNode =3D cn(n, "value");
+  var exceptionNode =3D cn(n, "exception");
+  if (exceptionNode !=3D null && call.exceptionHandler !=3D null) {
+    var msgNode =3D cn(exceptionNode, "message");
+    var msg =3D Seam.unmarshalValue(msgNode.firstChild);
+    call.exceptionHandler(new Seam.Exception(msg));
+  } else if (call.callback !=3D null) {
+    var refsNode =3D cn(n, "refs");
+    var refs =3D Seam.unmarshalRefs(refsNode);
+    var v =3D Seam.unmarshalValue(valueNode.firstChild, refs);
+    call.callback(v, call.context);
+  } =

+}
+
+Seam.preProcessModelResponse =3D function(call) {
+  var bodyNode =3D cn(doc.documentElement, "body");
+  if (bodyNode) {
+    var n =3D Seam.Xml.childNodes(bodyNode, "model");
+    for (var i=3D0; i<n.length; i++) {
+      var callId =3D n[i].getAttribute("callId");
+      var call =3D Seam.pendingCalls.get(callId);
+      Seam.pendingCalls.remove(callId);
+      if (call.model) call.model.processResponse(n[i]);
+    }
+  }  =

+}
+
 Seam.displayError =3D function(code) {
   alert("There was an error processing your request.  Error code: " + code=
);
 }
@@ -466,50 +509,49 @@
   if (!doc.documentElement) return;
   var ctx =3D new Seam.Context;
   var headerNode =3D cn(doc.documentElement, "header");
-  var bodyNode =3D cn(doc.documentElement, "body");
   if (headerNode) {
     var contextNode =3D cn(headerNode, "context");
     if (contextNode) {
       Seam.unmarshalContext(contextNode, ctx);
-    }
-  }
-  Seam.context.setConversationId(ctx.getConversationId() ? ctx.getConversa=
tionId() : null);
-  if (bodyNode) {
-    var n =3D cn(bodyNode, "result");
-    if (n) {
-      var callId =3D n.getAttribute("id");
-      var call =3D Seam.pendingCalls.get(callId);
-      Seam.pendingCalls.remove(callId);
-      if (call && (call.callback || call.exceptionHandler)) {
-        var valueNode =3D cn(n, "value");
-        var refsNode =3D cn(n, "refs");
-        var exceptionNode =3D cn(n, "exception");
-        if (exceptionNode !=3D null) {
-          var msgNode =3D cn(exceptionNode, "message");
-          var msg =3D Seam.unmarshalValue(msgNode.firstChild);
-          call.exceptionHandler(new Seam.Exception(msg));
-        } else {
-          var refs =3D Seam.unmarshalRefs(refsNode);
-          var v =3D Seam.unmarshalValue(valueNode.firstChild, refs);
-          call.callback(v, ctx, callId);
-        }
+      var call =3D Seam.pendingCalls.get(ctx.getCallId());
+      Seam.context.setConversationId(ctx.getConversationId() ? ctx.getConv=
ersationId() : null);
+      if (call) {
+        call.context =3D ctx;
+        call.response =3D doc;
+        if (call.handler) call.handler(call); =

       }
     }
-    var n =3D Seam.Xml.childNodes(bodyNode, "model");
-    for (var i=3D0; i<n.length; i++) {
-      var callId =3D n[i].getAttribute("callId");
-      var call =3D Seam.pendingCalls.get(callId);
-      Seam.pendingCalls.remove(callId);
-      if (call.model) call.model.processResponse(n[i]);
-    }
   }
 }
 =

+Seam.processLoadTypes =3D function(callId) {
+  var call =3D Seam.pendingCalls.get(callId);
+  if (call) {
+    Seam.pendingCalls.remove(callId);
+    if (call.model) call.model.processResponse(call.model.modelNode, true);
+  }
+}
+
 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 [];
+  var cn =3D Seam.Xml.childNodes(refsNode, "ref");
+  for (var i=3D0; i<cn.length; i++) {
+    var n =3D cn[i].firstChild;
+    if (n.tagName =3D=3D "bean") {
+      var name =3D n.getAttribute("type");
+      if (!Seam.isBeanRegistered(name)) unknowns.push(name);
+    } =

+  } =

+  return unknowns;
+}
+
 Seam.unmarshalRefs =3D function(refsNode) {
   if (!refsNode) return;
   var refs =3D [];
@@ -826,7 +868,7 @@
   Seam.Model.prototype.fetch =3D function(action, callback) {
     this.callback =3D callback;
     var r =3D this.createFetchRequest(action);
-    var env =3D Seam.createEnvelope(Seam.createHeader(), r.data);
+    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=
);
   }
@@ -882,19 +924,18 @@
       }
     }
     d +=3D "</model>";
-    return {data:d, id:callId, model:this};
+    return {data:d, id:callId, model:this, handler: null};
   }
 =

   Seam.Model.prototype.processResponse =3D function(modelNode) {
+    var refsNode =3D Seam.Xml.childNode(modelNode, "refs");
     this.id =3D modelNode.getAttribute("uid");
-    var valueNodes =3D Seam.Xml.childNodes(modelNode, "value");
-    var refsNode =3D Seam.Xml.childNode(modelNode, "refs");
+    var valueNodes =3D Seam.Xml.childNodes(modelNode, "value");         =

     this.sourceRefs =3D Seam.unmarshalRefs(refsNode);
     this.workingRefs =3D Seam.cloneObject(this.sourceRefs);
     for (var i=3D0; i<valueNodes.length; i++) {
       var value =3D Seam.unmarshalValue(valueNodes[i].firstChild,this.work=
ingRefs);
       this.values.push({alias:valueNodes[i].getAttribute("alias"),value:va=
lue, refIndex:i});
-
     }
     if (this.callback) this.callback(this);
   }
@@ -905,7 +946,7 @@
       d.scanForChanges(this.values[i].value);
     }
     var r =3D this.createApplyRequest(a, d);
-    var env =3D Seam.createEnvelope(Seam.createHeader(), r.data);
+    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=
);
   }
@@ -963,7 +1004,7 @@
       d +=3D "</refs>";
     }
     d +=3D "</model>";
-    return {data:d, id:callId, model:this};
+    return {data:d, id:callId, model:this, handler: null};
   }
 =

   Seam.Model.prototype.getRefId =3D function(v) {


--===============2668170353838548208==--