From jboss-remoting-commits at lists.jboss.org Sat Aug 29 20:38:40 2009
Content-Type: multipart/mixed; boundary="===============6194610071332040902=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r5401 - in
 remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servlet/marshal:
 WEB-INF and 1 other directory.
Date: Sat, 29 Aug 2009 20:38:39 -0400
Message-ID: <200908300038.n7U0cdYA024841@svn01.web.mwc.hst.phx2.redhat.com>

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

Author: ron.sigal(a)jboss.com
Date: 2009-08-29 20:38:39 -0400 (Sat, 29 Aug 2009)
New Revision: 5401

Added:
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/ContentTypeTestClient.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/TestInvocationHandler.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/TestMarshaller.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/TestUnMarshaller.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/WEB-INF/
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/WEB-INF/web.xml
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/remoting-servlet-service.xml
Log:
JBREM-1145: Added unit tests for servlet transport.

Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/ContentTypeTestClient.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
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/ContentTypeTestClient.java	                        (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/ContentTypeTestClient.java	2009-08-30 00:38:39 UTC (rev 5401)
@@ -0,0 +1,132 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.remoting.transport.servlet.marshal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.transport.http.HTTPMetadataConstants;
+import org.jboss.test.remoting.transport.http.marshal.HttpContentTypeTestC=
ase;
+
+
+/**
+ * Unit tests for JBREM-1145.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright August 17, 2009
+ * </p>
+ */
+public class ContentTypeTestClient extends HttpContentTypeTestCase
+{
+   private static Logger log =3D Logger.getLogger(ContentTypeTestClient.cl=
ass);
+   =

+   =

+   protected void validateOrdinaryInvocation(Client client) throws Throwab=
le
+   {
+      // Local tests
+      log.info("TestMarshaller.marshallers.size(): " + TestMarshaller.mars=
hallers.size());
+      log.info("TestMarshaller.unmarshallers.size(): " + TestUnMarshaller.=
unmarshallers.size());
+      assertEquals(2, TestMarshaller.marshallers.size());
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,=
 ((TestMarshaller)TestMarshaller.marshallers.get(1)).type);
+      assertEquals(2, TestUnMarshaller.unmarshallers.size());
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,=
 ((TestUnMarshaller)TestUnMarshaller.unmarshallers.get(1)).type);
+
+      // Remote tests
+      int serverMarshallerCount =3D ((Integer) client.invoke(TestInvocatio=
nHandler.GET_NUMBER_OF_MARSHALLERS)).intValue();
+      log.info("server side marshallers: " + serverMarshallerCount);
+      int serverUnmarshallerCount =3D ((Integer) client.invoke(TestInvocat=
ionHandler.GET_NUMBER_OF_UNMARSHALLERS)).intValue();
+      log.info("server side unmarshallers: " + serverUnmarshallerCount);
+      Map metadata =3D new HashMap();
+      metadata.put(TestInvocationHandler.N, Integer.toString(serverMarshal=
lerCount - 1));
+      String type =3D (String) client.invoke(TestInvocationHandler.GET_NTH=
_MARSHALLER_TYPE, metadata);
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,=
 type);
+      metadata.put(TestInvocationHandler.N, Integer.toString(serverUnmarsh=
allerCount - 1));
+      type =3D (String) client.invoke(TestInvocationHandler.GET_NTH_UNMARS=
HALLER_TYPE, metadata);
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_STRING,=
 type);
+      client.invoke(TestInvocationHandler.RESET);
+   }
+   =

+   =

+   protected void validateRawStringMessage(Client client) throws Throwable
+   {
+      // Local tests
+      log.info("TestMarshaller.marshallers.size(): " + TestMarshaller.mars=
hallers.size());
+      log.info("TestMarshaller.unmarshallers.size(): " + TestUnMarshaller.=
unmarshallers.size());
+      assertEquals(2, TestMarshaller.marshallers.size());
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, ((T=
estMarshaller)TestMarshaller.marshallers.get(1)).type);
+      assertEquals(2, TestUnMarshaller.unmarshallers.size());
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, ((T=
estUnMarshaller)TestUnMarshaller.unmarshallers.get(1)).type);
+
+      // Remote tests
+      int serverMarshallerCount =3D ((Integer) client.invoke(TestInvocatio=
nHandler.GET_NUMBER_OF_MARSHALLERS)).intValue();
+      log.info("server side marshallers: " + serverMarshallerCount);
+      int serverUnmarshallerCount =3D ((Integer) client.invoke(TestInvocat=
ionHandler.GET_NUMBER_OF_UNMARSHALLERS)).intValue();
+      log.info("server side unmarshallers: " + serverUnmarshallerCount);
+      assertEquals(4, serverMarshallerCount);
+      assertEquals(6, serverUnmarshallerCount);
+      Map metadata =3D new HashMap();
+      metadata.put(TestInvocationHandler.N, "3");
+      String type =3D (String) client.invoke(TestInvocationHandler.GET_NTH=
_MARSHALLER_TYPE, metadata);
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, typ=
e);
+      metadata.put(TestInvocationHandler.N, "1");
+      type =3D (String) client.invoke(TestInvocationHandler.GET_NTH_UNMARS=
HALLER_TYPE, metadata);
+      assertEquals(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_STRING, typ=
e);
+      client.invoke(TestInvocationHandler.RESET);
+   }
+   =

+   protected String getTransport()
+   {
+      return "servlet";
+   }
+   =

+   protected void setupServer(boolean addUseRemotingContentType, boolean u=
seRemotingContentType) throws Exception
+   {
+      String path =3D null;
+      String useRemotingContentTypeAttribute =3D null;
+      if (addUseRemotingContentType)
+      {
+         if (useRemotingContentType)
+         {
+            path =3D "servlet-invoker/ServerInvokerServlet/true";
+            useRemotingContentTypeAttribute =3D "&useRemotingContentType=
=3Dtrue";         =

+         }
+         else
+         {
+            path =3D "servlet-invoker/ServerInvokerServlet/false";
+            useRemotingContentTypeAttribute =3D "&useRemotingContentType=
=3Dfalse";
+         }
+      }
+      else
+      {
+         path =3D "servlet-invoker/ServerInvokerServlet/default";
+         useRemotingContentTypeAttribute =3D "";
+      }
+      =

+      String locatorURI =3D "servlet://127.0.0.1:8080/" + path + "/?dataty=
pe=3Dtest&marshaller=3Dorg.jboss.test.remoting.marshall.TestMarshaller&unma=
rshaller=3Dorg.jboss.test.remoting.marshall.TestUnmarshaller" + useRemoting=
ContentTypeAttribute;
+      serverLocator =3D new InvokerLocator(locatorURI);
+   }
+}
\ No newline at end of file

Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/TestInvocationHandler.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
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/TestInvocationHandler.java	                        (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/TestInvocationHandler.java	2009-08-30 00:38:39 UTC (rev 5401)
@@ -0,0 +1,114 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.test.remoting.transport.servlet.marshal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import org.jboss.logging.Logger;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.marshal.MarshalFactory;
+import org.jboss.remoting.transport.http.HTTPMetadataConstants;
+
+
+/**
+ * For JBREM-1145.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright August 17, 2009
+ * </p>
+ */
+public class TestInvocationHandler implements ServerInvocationHandler
+{
+   public static String GET_NUMBER_OF_MARSHALLERS =3D "getNumberOfMarshall=
ers";
+   public static String GET_NUMBER_OF_UNMARSHALLERS =3D "getNumberOfUnmars=
hallers";  =

+   public static String GET_NTH_MARSHALLER_TYPE =3D "getNthMarshallerType";
+   public static String GET_NTH_UNMARSHALLER_TYPE =3D "getNthUnarshallerTy=
pe";
+   public static String RESET =3D "reset";
+   public static String N =3D "n";
+   =

+   private static Logger log =3D Logger.getLogger(TestInvocationHandler.cl=
ass);
+   =

+   static
+   {
+      MarshalFactory.addMarshaller("test", new TestMarshaller(), new TestU=
nMarshaller());
+   }
+   =

+   public void addListener(InvokerCallbackHandler callbackHandler) {}
+
+   public Object invoke(final InvocationRequest invocation) throws Throwab=
le
+   {
+      String s =3D (String) invocation.getParameter();
+      log.info("command: " + s);
+      if (RESET.equals(s))
+      {
+         log.info("doing reset");
+         TestMarshaller.marshallers.clear();
+         TestUnMarshaller.unmarshallers.clear();
+         log.info("TestMarshaller.marshallers: " + TestMarshaller.marshall=
ers);
+         log.info("TestUnMarshaller.unmarshallers: " + TestUnMarshaller.un=
marshallers);
+      }
+      else if (GET_NUMBER_OF_MARSHALLERS.equals(s))
+      {
+         return new Integer(TestMarshaller.marshallers.size());
+      }
+      else if (GET_NUMBER_OF_UNMARSHALLERS.equals(s))
+      {
+         return new Integer(TestUnMarshaller.unmarshallers.size());
+      }
+      else if (GET_NTH_MARSHALLER_TYPE.equals(s))
+      {
+         int n =3D Integer.valueOf((String)invocation.getRequestPayload().=
get(N)).intValue();
+         return ((TestMarshaller)TestMarshaller.marshallers.get(n)).type;
+      }
+      else if (GET_NTH_UNMARSHALLER_TYPE.equals(s))
+      {
+         int n =3D Integer.valueOf((String)invocation.getRequestPayload().=
get(N)).intValue();
+         return ((TestUnMarshaller)TestUnMarshaller.unmarshallers.get(n)).=
type;
+      }
+      else if ("abc".equals(s))
+      {
+         Map responseMap =3D invocation.getReturnPayload();
+         if (responseMap =3D=3D null)
+         {
+            responseMap =3D new HashMap();
+            invocation.setReturnPayload(responseMap);
+         }
+         responseMap.put(HTTPMetadataConstants.CONTENTTYPE, "text/html");
+         return invocation.getParameter();
+      }
+      =

+      return invocation.getParameter();
+   }
+   =

+   public void removeListener(InvokerCallbackHandler callbackHandler) {}
+   public void setMBeanServer(MBeanServer server) {}
+   public void setInvoker(ServerInvoker invoker) {}
+}
\ No newline at end of file

Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/TestMarshaller.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
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/TestMarshaller.java	                        (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/TestMarshaller.java	2009-08-30 00:38:39 UTC (rev 5401)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.remoting.transport.servlet.marshal;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+
+import org.jboss.logging.Logger;
+import org.jboss.remoting.marshal.Marshaller;
+import org.jboss.remoting.marshal.http.HTTPMarshaller;
+import org.jboss.remoting.transport.http.HTTPMetadataConstants;
+
+
+/**
+ * Part of unit tests for JBREM-1145
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Aug 20, 2009
+ * </p>
+ */
+public class TestMarshaller extends HTTPMarshaller
+{
+   private static Logger log =3D Logger.getLogger(TestMarshaller.class);
+
+   public static ArrayList marshallers =3D new ArrayList();
+   private static final long serialVersionUID =3D -7528137229006015488L;
+   public String type;
+
+   public void write(Object dataObject, OutputStream output, int version) =
throws IOException
+   {
+      log.info(this + " writing " + dataObject);
+      type =3D (dataObject instanceof String) ? HTTPMetadataConstants.REMO=
TING_CONTENT_TYPE_STRING : HTTPMetadataConstants.REMOTING_CONTENT_TYPE_NON_=
STRING;
+      super.write(dataObject, output, version);
+   }
+
+   public Marshaller cloneMarshaller() throws CloneNotSupportedException
+   {
+      TestMarshaller marshaller =3D new TestMarshaller();
+      marshallers.add(marshaller);
+      log.info("returning " + marshaller);
+      return marshaller;
+   }
+}

Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/TestUnMarshaller.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
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/TestUnMarshaller.java	                        (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/TestUnMarshaller.java	2009-08-30 00:38:39 UTC (rev 5401)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.remoting.transport.servlet.marshal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.remoting.marshal.UnMarshaller;
+import org.jboss.remoting.marshal.http.HTTPUnMarshaller;
+import org.jboss.remoting.transport.http.HTTPMetadataConstants;
+
+
+/**
+ * Part of unit tests for JBREM-1145.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version $Rev$
+ * <p>
+ * Copyright Aug 20, 2009
+ * </p>
+ */
+public class TestUnMarshaller extends HTTPUnMarshaller
+{
+   public static ArrayList unmarshallers =3D new ArrayList();
+   private static final long serialVersionUID =3D -6422222480047910351L;
+   public String type;
+   =

+   public Object read(InputStream inputStream, Map metadata, int version) =
throws IOException, ClassNotFoundException
+   {
+      Object o =3D metadata.get(HTTPMetadataConstants.REMOTING_CONTENT_TYP=
E);
+      if (o instanceof List)
+      {
+         type =3D (String) ((List) o).get(0);
+      }
+      else if (o instanceof String)
+      {
+         type =3D (String) o;
+      }
+      else =

+      {
+         o =3D metadata.get(HTTPMetadataConstants.REMOTING_CONTENT_TYPE_LC=
);
+         log.info("remotingcontenttype: " + o);
+         if (o instanceof List)
+         {
+            type =3D (String) ((List) o).get(0);
+         }
+         else if (o instanceof String)
+         {
+            type =3D (String) o;
+         }
+         else =

+         {
+            log.warn(this + " unrecognized remotingContentType: " + o);
+         } =

+      }
+      =

+      o =3D super.read(inputStream, metadata, version);
+      log.info(this + " read " + o);
+      return o;
+   }
+   =

+   public UnMarshaller cloneUnMarshaller() throws CloneNotSupportedExcepti=
on
+   {
+      TestUnMarshaller unmarshaller =3D new TestUnMarshaller();
+      unmarshallers.add(unmarshaller);
+      unmarshaller.setClassLoader(this.customClassLoader);
+      log.info("returning " + unmarshaller, new Exception());
+      return unmarshaller;
+   }
+}

Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/WEB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/WEB-INF/web.xml	                        (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/WEB-INF/web.xml	2009-08-30 00:38:39 UTC (rev 5401)
@@ -0,0 +1,65 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!-- The the JBossRemoting server invoker servlet web.xml descriptor
+$Id: web.xml 4903 2009-03-24 07:33:10Z ron.sigal(a)jboss.com $
+-->
+<web-app>
+    <servlet>
+        <servlet-name>ServerInvokerServletDefault</servlet-name>
+        <description>The ServerInvokerServlet receives requests via HTTP
+           protocol from within a web container and passes it onto the
+           ServletServerInvoker for processing.
+        </description>
+        <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvo=
kerServlet</servlet-class>
+        <init-param>
+            <param-name>locatorUrl</param-name>
+            <param-value>servlet://127.0.0.1:8080/servlet-invoker/ServerIn=
vokerServlet/default/?datatype=3Dtest&amp;marshaller=3Dorg.jboss.test.remot=
ing.transport.servlet.marshal.TestMarshaller&amp;unmarshaller=3Dorg.jboss.t=
est.remoting.transport.servlet.marshal.TestUnmarshaller</param-value>
+            <description>The servlet server invoker locator url</descripti=
on>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>ServerInvokerServletFalse</servlet-name>
+        <description>The ServerInvokerServlet receives requests via HTTP
+           protocol from within a web container and passes it onto the
+           ServletServerInvoker for processing.
+        </description>
+        <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvo=
kerServlet</servlet-class>
+        <init-param>
+            <param-name>locatorUrl</param-name>
+            <param-value>servlet://127.0.0.1:8080/servlet-invoker/ServerIn=
vokerServlet/false/?datatype=3Dtest&amp;marshaller=3Dorg.jboss.test.remotin=
g.transport.servlet.marshal.TestMarshaller&amp;unmarshaller=3Dorg.jboss.tes=
t.remoting.transport.servlet.marshal.TestUnmarshaller&amp;useRemotingConten=
tType=3Dfalse</param-value>
+            <description>The servlet server invoker locator url</descripti=
on>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>ServerInvokerServletTrue</servlet-name>
+        <description>The ServerInvokerServlet receives requests via HTTP
+           protocol from within a web container and passes it onto the
+           ServletServerInvoker for processing.
+        </description>
+        <servlet-class>org.jboss.remoting.transport.servlet.web.ServerInvo=
kerServlet</servlet-class>
+        <init-param>
+            <param-name>locatorUrl</param-name>
+            <param-value>servlet://127.0.0.1:8080/servlet-invoker/ServerIn=
vokerServlet/true/?datatype=3Dtest&amp;marshaller=3Dorg.jboss.test.remoting=
.transport.servlet.marshal.TestMarshaller&amp;unmarshaller=3Dorg.jboss.test=
.remoting.transport.servlet.marshal.TestUnmarshaller&amp;useRemotingContent=
Type=3Dtrue</param-value>
+            <description>The servlet server invoker locator url</descripti=
on>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ServerInvokerServletDefault</servlet-name>
+        <url-pattern>/ServerInvokerServlet/default/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ServerInvokerServletFalse</servlet-name>
+        <url-pattern>/ServerInvokerServlet/false/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ServerInvokerServletTrue</servlet-name>
+        <url-pattern>/ServerInvokerServlet/true/*</url-pattern>
+    </servlet-mapping>
+</web-app>
+

Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/remoting-servlet-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/remoting-servlet-service.xml	                        (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/remoting-servlet-service.xml	2009-08-30 00:38:39 UTC (rev 5401)
@@ -0,0 +1,66 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<server>
+   <mbean code=3D"org.jboss.remoting.transport.Connector"
+          name=3D"jboss.remoting:service=3DConnector,transport=3DServlet,u=
seRemotingContentType=3Ddefault"
+          display-name=3D"Servlet transport Connector (default)">
+
+      <attribute name=3D"Configuration">
+         <config>
+            <invoker transport=3D"servlet">
+               <attribute name=3D"serverBindAddress">127.0.0.1</attribute>
+               <attribute name=3D"serverBindPort">8080</attribute>
+               <attribute name=3D"path">servlet-invoker/ServerInvokerServl=
et/default</attribute>
+               <attribute name=3D"datatype" isParam=3D"true">test</attribu=
te>
+               <attribute name=3D"marshaller" isParam=3D"true">org.jboss.t=
est.remoting.transport.servlet.marshal.TestMarshaller</attribute>
+               <attribute name=3D"unmarshaller" isParam=3D"true">org.jboss=
.test.remoting.transport.servlet.marshal.TestUnMarshaller</attribute>
+            </invoker>
+            <handlers>
+               <handler subsystem=3D"test">org.jboss.test.remoting.transpo=
rt.servlet.marshal.TestInvocationHandler</handler>
+            </handlers>
+         </config>
+      </attribute>
+   </mbean>
+   <mbean code=3D"org.jboss.remoting.transport.Connector"
+          name=3D"jboss.remoting:service=3DConnector,transport=3DServlet,u=
seRemotingContentType=3Dfalse"
+          display-name=3D"Servlet transport Connector (false)">
+
+      <attribute name=3D"Configuration">
+         <config>
+            <invoker transport=3D"servlet">
+               <attribute name=3D"serverBindAddress">127.0.0.1</attribute>
+               <attribute name=3D"serverBindPort">8080</attribute>
+               <attribute name=3D"path">servlet-invoker/ServerInvokerServl=
et/false</attribute>
+               <attribute name=3D"datatype" isParam=3D"true">test</attribu=
te>
+               <attribute name=3D"marshaller" isParam=3D"true">org.jboss.t=
est.remoting.transport.servlet.marshal.TestMarshaller</attribute>
+               <attribute name=3D"unmarshaller" isParam=3D"true">org.jboss=
.test.remoting.transport.servlet.marshal.TestUnMarshaller</attribute>
+               <attribute name=3D"useRemotingContentType" isParam=3D"true"=
>false</attribute>
+            </invoker>
+            <handlers>
+               <handler subsystem=3D"test">org.jboss.test.remoting.transpo=
rt.servlet.marshal.TestInvocationHandler</handler>
+            </handlers>
+         </config>
+      </attribute>
+   </mbean>
+   <mbean code=3D"org.jboss.remoting.transport.Connector"
+          name=3D"jboss.remoting:service=3DConnector,transport=3DServlet,u=
seRemotingContentType=3Dtrue"
+          display-name=3D"Servlet transport Connector (true)">
+
+      <attribute name=3D"Configuration">
+         <config>
+            <invoker transport=3D"servlet">
+               <attribute name=3D"serverBindAddress">127.0.0.1</attribute>
+               <attribute name=3D"serverBindPort">8080</attribute>
+               <attribute name=3D"path">servlet-invoker/ServerInvokerServl=
et/true</attribute>
+               <attribute name=3D"datatype" isParam=3D"true">test</attribu=
te>
+               <attribute name=3D"marshaller" isParam=3D"true">org.jboss.t=
est.remoting.transport.servlet.marshal.TestMarshaller</attribute>
+               <attribute name=3D"unmarshaller" isParam=3D"true">org.jboss=
.test.remoting.transport.servlet.marshal.TestUnMarshaller</attribute>
+               <attribute name=3D"useRemotingContentType" isParam=3D"true"=
>true</attribute>
+            </invoker>
+            <handlers>
+               <handler subsystem=3D"test">org.jboss.test.remoting.transpo=
rt.servlet.marshal.TestInvocationHandler</handler>
+            </handlers>
+         </config>
+      </attribute>
+   </mbean>
+</server>


--===============6194610071332040902==--