svn commit: r660683 - in /openejb/trunk/openejb3: assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/ assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/WEB-INF/ server/openejb-http/src/main/java/org...

[dblevins]

Author: dblevins
Date: Tue May 27 13:17:36 2008
New Revision: 660683

URL: http://svn.apache.org/viewvc?rev=660683&view=rev
Log:
Move the server servlet into the openejb-http package so it can be used by more 
than just tomcat

Added:
    
openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java
      - copied, changed from r655683, 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/ServerServlet.java
Removed:
    
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/ServerServlet.java
Modified:
    
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/WEB-INF/web.xml

Modified: 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/WEB-INF/web.xml?rev=660683&r1=660682&r2=660683&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/WEB-INF/web.xml
 (original)
+++ 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/webapp/WEB-INF/web.xml
 Tue May 27 13:17:36 2008
@@ -32,7 +32,7 @@
 
   <servlet>
     <servlet-name>ServerServlet</servlet-name>
-    
<servlet-class>org.apache.openejb.tomcat.common.ServerServlet</servlet-class>
+    
<servlet-class>org.apache.openejb.server.httpd.ServerServlet</servlet-class>
   </servlet>
 
   <servlet>

Copied: 
openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java
 (from r655683, 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/ServerServlet.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java?p2=openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java&p1=openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/ServerServlet.java&r1=655683&r2=660683&rev=660683&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/src/main/java/org/apache/openejb/tomcat/common/ServerServlet.java
 (original)
+++ 
openejb/trunk/openejb3/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java
 Tue May 27 13:17:36 2008
@@ -15,7 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.openejb.tomcat.common;
+package org.apache.openejb.server.httpd;
 
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.server.ServiceException;