From do-not-reply at jboss.org Mon Oct  5 06:46:23 2009
Content-Type: multipart/mixed; boundary="===============0083493862942906808=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: exo-jcr-commits at lists.jboss.org
Subject: [exo-jcr-commits] exo-jcr SVN: r212 -
 ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet.
Date: Mon, 05 Oct 2009 06:46:23 -0400
Message-ID: <200910051046.n95AkNT1025520@svn01.web.mwc.hst.phx2.redhat.com>

--===============0083493862942906808==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: nfilotto
Date: 2009-10-05 06:46:23 -0400 (Mon, 05 Oct 2009)
New Revision: 212

Modified:
   ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet/R=
estServlet.java
Log:
EXOJCR-166: Support separated ear delivery

Modified: ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/se=
rvlet/RestServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet/=
RestServlet.java	2009-10-05 10:45:29 UTC (rev 211)
+++ ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet/=
RestServlet.java	2009-10-05 10:46:23 UTC (rev 212)
@@ -19,7 +19,7 @@
 package org.exoplatform.services.rest.servlet;
 =

 import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.web.AbstractHttpServlet;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.rest.Connector;
@@ -38,7 +38,6 @@
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.ext.MessageBodyWriter;
@@ -49,7 +48,7 @@
  * @author <a href=3D"mailto:andrew00x(a)gmail.com">Andrey Parfonov</a>
  * @version $Id: $
  */
-public class RestServlet extends HttpServlet implements Connector
+public class RestServlet extends AbstractHttpServlet implements Connector
 {
 =

    private static final Log LOG =3D ExoLogger.getLogger(RestServlet.class.=
getName());
@@ -60,43 +59,20 @@
    private static final long serialVersionUID =3D 2152962763071591181L;
 =

    /**
-    * See {@link ServletConfig}.
-    */
-   private ServletConfig config;
-
-   /**
-    * See {@link ServletContext}.
-    */
-   private ServletContext context;
-
-   /**
     * {@inheritDoc}
     */
    @Override
-   public void init(ServletConfig config)
+   protected void onService(ExoContainer container, HttpServletRequest htt=
pRequest, HttpServletResponse httpResponse)
+      throws IOException, ServletException
    {
-      this.config =3D config;
-      this.context =3D config.getServletContext();
-   }
 =

-   /**
-    * {@inheritDoc}
-    */
-   @Override
-   public void service(HttpServletRequest httpRequest, HttpServletResponse=
 httpResponse) throws IOException,
-      ServletException
-   {
-      // Current container must be set by filter.
-
-      ExoContainer container =3D ExoContainerContext.getCurrentContainer();
-
       RequestHandler requestHandler =3D (RequestHandler)container.getCompo=
nentInstanceOfType(RequestHandler.class);
 =

       EnvironmentContext env =3D new EnvironmentContext();
       env.put(HttpServletRequest.class, httpRequest);
       env.put(HttpServletResponse.class, httpResponse);
       env.put(ServletConfig.class, config);
-      env.put(ServletContext.class, context);
+      env.put(ServletContext.class, getServletContext());
 =

       try
       {
@@ -177,5 +153,4 @@
          }
       }
    }
-
 }


--===============0083493862942906808==--