Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: roller-dev@incubator.apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r417635 - in
 /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity:
 CommentServlet.java deprecated/CommentServlet.java
Date: Wed, 28 Jun 2006 02:07:40 -0000
To: roller-commits@incubator.apache.org
From: agilliland@apache.org
Message-Id: <20060628020741.106A11A983A@eris.apache.org>

Author: agilliland
Date: Tue Jun 27 19:07:40 2006
New Revision: 417635

URL: http://svn.apache.org/viewvc?rev=417635&view=rev
Log:
moving old comment servlet into the velocity deprecated package which is where we'll put all of our redirect servlets moving forward.


Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/CommentServlet.java
      - copied, changed from r417491, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java
Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/CommentServlet.java (from r417491, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/CommentServlet.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/CommentServlet.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java&r1=417491&r2=417635&rev=417635&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/CommentServlet.java Tue Jun 27 19:07:40 2006
@@ -1,21 +1,22 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-*  contributor license agreements.  The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.  For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
-package org.apache.roller.ui.rendering.velocity;
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.ui.rendering.velocity.deprecated;
 
 import java.io.IOException;
 import javax.servlet.RequestDispatcher;
@@ -23,7 +24,6 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.pojos.WeblogEntryData;
@@ -40,13 +40,10 @@
  *
  * @web.servlet name="CommentsServlet"
  * @web.servlet-mapping url-pattern="/comments/*"
- *
- * @author Allen Gilliland
  */
 public class CommentServlet extends HttpServlet {
     
-    private static Log mLogger =
-            LogFactory.getFactory().getInstance(CommentServlet.class);
+    private static Log log = LogFactory.getLog(CommentServlet.class);
     
     
     /**
@@ -56,7 +53,7 @@
      * because these old comment servlet urls are deprecated now.
      */
     public void doGet(HttpServletRequest request, HttpServletResponse response)
-        throws IOException, ServletException {
+            throws IOException, ServletException {
         
         // a GET request means that this client is trying to use this old
         // comment servlet as a form of permalink for rendering an entry.
@@ -85,7 +82,7 @@
             }
                 
         }        
-        mLogger.debug("forwarding to "+forward);
+        log.debug("forwarding to "+forward);
         
         // send an HTTP 301 response
         response.setStatus(response.SC_MOVED_PERMANENTLY);
@@ -105,7 +102,7 @@
     public void doPost(HttpServletRequest request, HttpServletResponse response)
         throws IOException, ServletException {
         
-        mLogger.warn(request.getHeader("referer")+
+        log.warn(request.getHeader("referer")+
                 " is posting to the OLD CommentServlet");
         
         // just dispatch to new CommentServlet