[jboss-remoting-commits] JBoss Remoting SVN: r6061 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2010-08-05 14:52:58 -0400 (Thu, 05 Aug 2010)
New Revision: 6061

Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml
Log:
JBREM-1241: Reverting to correct contents.

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml	2010-08-05 18:48:46 UTC (rev 6060)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/servlet/preservelines/WEB-INF/web.xml	2010-08-05 18:52:58 UTC (rev 6061)
@@ -4,65 +4,25 @@
    "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 at jboss.com $
+$Id: web.xml 3291 2008-01-15 05:03:53Z ron.sigal at jboss.com $
 -->
 <web-app>
     <servlet>
-        <servlet-name>ServerInvokerServletOK</servlet-name>
+        <servlet-name>ServerInvokerServlet</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.ServerInvokerServlet</servlet-class>
         <init-param>
-            <param-name>locatorUrl</param-name>
-            <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?version=OK</param-value>
-            <description>The servlet server invoker locator url</description>
+            <param-name>invokerName</param-name>
+            <param-value>jboss.remoting:service=invoker,transport=servlet</param-value>
+            <description>The servlet server invoker</description>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    
-    <servlet>
-        <servlet-name>ServerInvokerServletCR</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.ServerInvokerServlet</servlet-class>
-        <init-param>
-            <param-name>locatorUrl</param-name>
-            <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?version=CR</param-value>
-            <description>The servlet server invoker locator url</description>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>ServerInvokerServletLF</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.ServerInvokerServlet</servlet-class>
-        <init-param>
-            <param-name>locatorUrl</param-name>
-            <param-value>servlet://localhost:8080/servlet-invoker/ServerInvokerServlet/?version=LF</param-value>
-            <description>The servlet server invoker locator url</description>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>    
-
     <servlet-mapping>
-        <servlet-name>ServerInvokerServletOK</servlet-name>
-        <url-pattern>/ServerInvokerServlet/OK/*</url-pattern>
-    </servlet-mapping>    
-    <servlet-mapping>
-        <servlet-name>ServerInvokerServletCR</servlet-name>
-        <url-pattern>/ServerInvokerServlet/CR/*</url-pattern>
+        <servlet-name>ServerInvokerServlet</servlet-name>
+        <url-pattern>/ServerInvokerServlet/*</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ServerInvokerServletLF</servlet-name>
-        <url-pattern>/ServerInvokerServlet/LF/*</url-pattern>
-    </servlet-mapping>
-</web-app>
-
+</web-app>
\ No newline at end of file