use Servlet 3.0 features

weld · Jun 16, 2010 · be04336 · be04336
1 parent 3171183
commit be04336
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/jsf/pastecode/pom.xml b/jsf/pastecode/pom.xml
@@ -38,9 +38,9 @@
       </dependency>
 
       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-         <version>2.5</version>
+         <groupId>org.jboss.spec.javax.servlet</groupId>
+         <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+         <version>1.0.0.Beta2</version>
          <scope>provided</scope>
       </dependency>
 

diff --git a/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java b/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java
@@ -23,36 +23,30 @@
 
 import java.io.IOException;
 
-import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.jboss.weld.examples.pastecode.model.CodeFragment;
 import org.jboss.weld.examples.pastecode.session.CodeFragmentManager;
 
+@WebServlet("/download")
 public class DownloadServlet extends HttpServlet
 {
    private static final long serialVersionUID = 1L;
 
    @Inject
-   Instance<CodeFragmentManager> eaoIn;
-   CodeFragmentManager eao;
-
-   public DownloadServlet()
-   {
-   }
+   private CodeFragmentManager codeFragmentManager;
 
    @Override
    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
    {
-
-      this.eao = eaoIn.get();
       String id = request.getParameter("id");
-      CodeFragment c = eao.getCodeFragment(id);
+      CodeFragment c = codeFragmentManager.getCodeFragment(id);
       String fileName = c.getUser() + "." + c.getLanguage();
       String txt = c.getText();
 

diff --git a/jsf/pastecode/src/main/webapp/WEB-INF/web.xml b/jsf/pastecode/src/main/webapp/WEB-INF/web.xml
@@ -28,14 +28,4 @@
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>FORWARD</dispatcher>
   </filter-mapping>
-  <servlet>
-    <description></description>
-    <display-name>DownloadServlet</display-name>
-    <servlet-name>DownloadServlet</servlet-name>
-    <servlet-class>org.jboss.weld.examples.pastecode.servlets.DownloadServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>DownloadServlet</servlet-name>
-    <url-pattern>/download</url-pattern>
-  </servlet-mapping>
 </web-app>