[weld-commits] Weld SVN: r6463 - in examples/trunk/jsf/pastecode: src/main/java/org/jboss/weld/examples/pastecode/servlets and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2010-06-16 16:30:44 -0400 (Wed, 16 Jun 2010) New Revision: 6463 Modified: examples/trunk/jsf/pastecode/pom.xml examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/web.xml Log: use Servlet 3.0 features Modified: examples/trunk/jsf/pastecode/pom.xml =================================================================== --- examples/trunk/jsf/pastecode/pom.xml 2010-06-16 20:05:50 UTC (rev 6462) +++ examples/trunk/jsf/pastecode/pom.xml 2010-06-16 20:30:44 UTC (rev 6463) @@ -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> Modified: examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java =================================================================== --- examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java 2010-06-16 20:05:50 UTC (rev 6462) +++ examples/trunk/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/servlets/DownloadServlet.java 2010-06-16 20:30:44 UTC (rev 6463) @@ -23,10 +23,10 @@ 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; @@ -34,25 +34,19 @@ 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; + private CodeFragmentManager codeFragmentManager; - public DownloadServlet() - { - } - @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(); Modified: examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/web.xml 2010-06-16 20:05:50 UTC (rev 6462) +++ examples/trunk/jsf/pastecode/src/main/webapp/WEB-INF/web.xml 2010-06-16 20:30:44 UTC (rev 6463) @@ -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> \ No newline at end of file