From jboss-remoting-commits at lists.jboss.org Sun May 17 04:05:18 2009
Content-Type: multipart/mixed; boundary="===============4152081198198091789=="
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: r5267 - in
 remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/marshal:
 config and 1 other directories.
Date: Sun, 17 May 2009 03:58:38 -0400
Message-ID: <E1M5bGY-0002Ik-7R@committer01.frg.pub.inap.atl.jboss.com>

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

Author: ron.sigal(a)jboss.com
Date: 2009-05-17 03:58:37 -0400 (Sun, 17 May 2009)
New Revision: 5267

Added:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/config/
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/config/ServletConfigurationMapTestClient.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/config/remoting-servlet-service.xml
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/noconfig/
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/noconfig/ServletConfigurationMapTestClient.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/noconfig/remoting-servlet-service.xml
Removed:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/ServletConfigurationMapTestClient.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servl=
et/marshal/remoting-servlet-service.xml
Log:
JBREM-1102: Broke org.jboss.tests.remoting.transport.servlet.marshal into .=
..marshal.config and ...marshal.noconfig.

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport=
/servlet/marshal/ServletConfigurationMapTestClient.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.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/ServletConfigurationMapTestClient.java	2009-05-17 07:55:16 UTC =
(rev 5266)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/ServletConfigurationMapTestClient.java	2009-05-17 07:58:37 UTC =
(rev 5267)
@@ -1,71 +0,0 @@
-/*
- * 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.util.Map;
-
-import org.apache.log4j.Logger;
-import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent;
-
-/**
- * Unit tests for JBREM-1102.
- * =

- * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version =

- * <p>
- * Copyright Mar 21, 2009
- * </p>
- */
-public class ServletConfigurationMapTestClient extends ConfigurationMapTes=
tParent
-{
-   protected static Logger log =3D Logger.getLogger(ServletConfigurationMa=
pTestClient.class);
-   =

-   public void testDatatypeConfig() throws Throwable
-   {
-      log.info("skipping " + getName());
-   }
-   =

-   protected int configTestMarshallerCount()
-   {
-      return 1;
-   }
-   =

-   protected int configTestUnmarshallerCount()
-   {
-      return 1;
-   }
-   =

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

-   protected void setupServer(String parameter, Map extraConfig) throws Ex=
ception
-   {
-      locatorURI =3D "servlet://localhost:8080/servlet-invoker/ServerInvok=
erServlet/?" +
-                   "marshaller=3Dorg.jboss.test.remoting.marshall.config.C=
onfigTestMarshaller&" +
-                   "unmarshaller=3Dorg.jboss.test.remoting.marshall.config=
.ConfigTestUnmarshaller";
-         =

-      log.info("setting InvokerLocator to " + locatorURI);
-   }
-}
-

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/config/ServletConfigurationMapTestClient.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.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/config/ServletConfigurationMapTestClient.java	                 =
       (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/config/ServletConfigurationMapTestClient.java	2009-05-17 07:58:=
37 UTC (rev 5267)
@@ -0,0 +1,96 @@
+/*
+ * 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.config;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent;
+
+/**
+ * Unit tests for JBREM-1102.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version =

+ * <p>
+ * Copyright Mar 21, 2009
+ * </p>
+ */
+public class ServletConfigurationMapTestClient extends ConfigurationMapTes=
tParent
+{
+   protected static Logger log =3D Logger.getLogger(ServletConfigurationMa=
pTestClient.class);
+   =

+   public void testDatatypeConfigDefault() throws Throwable
+   {
+      log.info("skipping " + getName());
+   }
+   =

+   public void testDatatypePassConfigMapFalse() throws Throwable
+   {
+      log.info("skipping " + getName());
+   }
+   =

+   public void testFQNConfigDefault() throws Throwable
+   {
+      log.info("skipping " + getName());
+   }
+   =

+   public void testFQNPassConfigMapFalse() throws Throwable
+   {
+      log.info("skipping " + getName());
+   }
+   =

+   protected int marshallerCountDatatype()
+   {
+      return 2;
+   }
+   =

+   protected int unmarshallerCountDatatype()
+   {
+      return 2;
+   }
+   =

+   protected int marshallerCountFQN()
+   {
+      return 1;
+   }
+   =

+   protected int unmarshallerCountFQN()
+   {
+      return 1;
+   }
+   =

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

+   protected void setupServer(String parameter, Map extraConfig) throws Ex=
ception
+   {
+      locatorURI =3D "servlet://localhost:8080/servlet-invoker/ServerInvok=
erServlet/?" + parameter;
+//                   "marshaller=3Dorg.jboss.test.remoting.marshall.config=
.ConfigTestMarshaller&" +
+//                   "unmarshaller=3Dorg.jboss.test.remoting.marshall.conf=
ig.ConfigTestUnmarshaller";
+         =

+      log.info("setting InvokerLocator to " + locatorURI);
+   }
+}
+

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/config/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.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/config/remoting-servlet-service.xml	                        (re=
v 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/config/remoting-servlet-service.xml	2009-05-17 07:58:37 UTC (re=
v 5267)
@@ -0,0 +1,23 @@
+<?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=3DS=
ervlet,target=3Dtests"
+                  display-name=3D"Servlet transport Connector">
+
+              <attribute name=3D"InvokerLocator">
+                 servlet://localhost:8080/servlet-invoker/ServerInvokerSer=
vlet/?marshaller=3Dorg.jboss.test.remoting.marshall.config.ConfigTestMarsha=
ller&amp;unmarshaller=3Dorg.jboss.test.remoting.marshall.config.ConfigTestU=
nmarshaller
+              </attribute>
+
+              <attribute name=3D"Configuration">
+                 <config>
+                    <handlers>
+                       <handler subsystem=3D"test">org.jboss.test.remoting=
.marshall.config.TestInvocationHandler</handler>
+                    </handlers>
+                 </config>
+              </attribute>
+           </mbean>
+
+
+</server>

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/noconfig/ServletConfigurationMapTestClient.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.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/noconfig/ServletConfigurationMapTestClient.java	               =
         (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/noconfig/ServletConfigurationMapTestClient.java	2009-05-17 07:5=
8:37 UTC (rev 5267)
@@ -0,0 +1,96 @@
+/*
+ * 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.noconfig;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.jboss.test.remoting.marshall.config.ConfigurationMapTestParent;
+
+/**
+ * Unit tests for JBREM-1102.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version =

+ * <p>
+ * Copyright Mar 21, 2009
+ * </p>
+ */
+public class ServletConfigurationMapTestClient extends ConfigurationMapTes=
tParent
+{
+   protected static Logger log =3D Logger.getLogger(ServletConfigurationMa=
pTestClient.class);
+   =

+   public void testDatatypePassConfigMapTrue() throws Throwable
+   {
+      log.info("skipping " + getName());
+   }
+   =

+   public void testFQNConfigPassConfigMapTrue() throws Throwable
+   {
+      log.info("skipping " + getName());
+   }
+   =

+   protected int marshallerCountDatatype()
+   {
+      return 2;
+   }
+   =

+   protected int unmarshallerCountDatatype()
+   {
+      return 2;
+   }
+   =

+   protected int marshallerCountFQN()
+   {
+      return 1;
+   }
+   =

+   protected int unmarshallerCountFQN()
+   {
+      return 1;
+   }
+   =

+   protected int marshallerDatatypeUnused()
+   {
+      return 0;
+   }
+
+   protected int marshallerFQNUnused()
+   {
+      return 0;
+   }
+   =

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

+   protected void setupServer(String parameter, Map extraConfig) throws Ex=
ception
+   {
+      locatorURI =3D "servlet://localhost:8080/servlet-invoker/ServerInvok=
erServlet/?" + parameter;
+//                   "marshaller=3Dorg.jboss.test.remoting.marshall.config=
.ConfigTestMarshaller&" +
+//                   "unmarshaller=3Dorg.jboss.test.remoting.marshall.conf=
ig.ConfigTestUnmarshaller";
+         =

+      log.info("setting InvokerLocator to " + locatorURI);
+   }
+}
+

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/s=
ervlet/marshal/noconfig/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.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/noconfig/remoting-servlet-service.xml	                        (=
rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/noconfig/remoting-servlet-service.xml	2009-05-17 07:58:37 UTC (=
rev 5267)
@@ -0,0 +1,23 @@
+<?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=3DS=
ervlet,target=3Dtests"
+                  display-name=3D"Servlet transport Connector">
+
+              <attribute name=3D"InvokerLocator">
+                 servlet://localhost:8080/servlet-invoker/ServerInvokerSer=
vlet
+              </attribute>
+
+              <attribute name=3D"Configuration">
+                 <config>
+                    <handlers>
+                       <handler subsystem=3D"test">org.jboss.test.remoting=
.marshall.config.TestInvocationHandler</handler>
+                    </handlers>
+                 </config>
+              </attribute>
+           </mbean>
+
+
+</server>

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport=
/servlet/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.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/remoting-servlet-service.xml	2009-05-17 07:55:16 UTC (rev 5266)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/serv=
let/marshal/remoting-servlet-service.xml	2009-05-17 07:58:37 UTC (rev 5267)
@@ -1,23 +0,0 @@
-<?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=3DS=
ervlet,target=3Dtests"
-                  display-name=3D"Servlet transport Connector">
-
-              <attribute name=3D"InvokerLocator">
-                 servlet://localhost:8080/servlet-invoker/ServerInvokerSer=
vlet/?marshaller=3Dorg.jboss.test.remoting.marshall.config.ConfigTestMarsha=
ller&amp;unmarshaller=3Dorg.jboss.test.remoting.marshall.config.ConfigTestU=
nmarshaller
-              </attribute>
-
-              <attribute name=3D"Configuration">
-                 <config>
-                    <handlers>
-                       <handler subsystem=3D"test">org.jboss.test.remoting=
.marshall.config.TestInvocationHandler</handler>
-                    </handlers>
-                 </config>
-              </attribute>
-           </mbean>
-
-
-</server>


--===============4152081198198091789==--