[jboss-svn-commits] JBL Code SVN: r37166 - in labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main: webapp/WEB-INF and 1 other directory.

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

Author: tomjenkinson
Date: 2011-06-29 09:39:42 -0400 (Wed, 29 Jun 2011)
New Revision: 37166

Modified:
   labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/java/org/jboss/narayana/examples/servlet/SimpleServlet.java
   labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/webapp/WEB-INF/web.xml
Log:
updated to use an annotation to define the servlet

Modified: labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/java/org/jboss/narayana/examples/servlet/SimpleServlet.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/java/org/jboss/narayana/examples/servlet/SimpleServlet.java	2011-06-29 13:17:03 UTC (rev 37165)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/java/org/jboss/narayana/examples/servlet/SimpleServlet.java	2011-06-29 13:39:42 UTC (rev 37166)
@@ -6,6 +6,7 @@
 import javax.ejb.EJB;
 import javax.naming.InitialContext;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,6 +14,7 @@
 
 import org.jboss.narayana.examples.ejb.SimpleEJB;
 
+ at WebServlet(displayName = "hello", urlPatterns = "/hello")
 public class SimpleServlet extends HttpServlet {
 
 	@EJB

Modified: labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/webapp/WEB-INF/web.xml	2011-06-29 13:17:03 UTC (rev 37165)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/integration/src/main/webapp/WEB-INF/web.xml	2011-06-29 13:39:42 UTC (rev 37166)
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" metadata-complete="false">
-  <servlet>
-    <servlet-name>hello</servlet-name>
-    <servlet-class>org.jboss.narayana.examples.servlet.SimpleServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>hello</servlet-name>
-    <url-pattern>/hello</url-pattern>
-  </servlet-mapping>
 </web-app>