You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2008/04/25 02:47:55 UTC
svn commit: r651470 - in
/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view: ./
servlet/
Author: nbubna
Date: Thu Apr 24 17:47:52 2008
New Revision: 651470
URL: http://svn.apache.org/viewvc?rev=651470&view=rev
Log:
log some helpful (hopefully) deprecation/migration notices
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletLogger.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java?rev=651470&r1=651469&r2=651470&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java Thu Apr 24 17:47:52 2008
@@ -30,6 +30,7 @@
* @author <a href="mailto:henning@schmiedehausen.org">Henning P. Schmiedehausen</a>
* @version $Id$
*/
+@Deprecated
public interface ToolboxManager
{
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java?rev=651470&r1=651469&r2=651470&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java Thu Apr 24 17:47:52 2008
@@ -96,6 +96,9 @@
{
toolinfo = new ArrayList();
data = new HashMap();
+
+ LOG.warn("XMLToolboxManager has been deprecated. Please use "+
+ "org.apache.velocity.tools.ToolboxFactory instead.");
}
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletLogger.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletLogger.java?rev=651470&r1=651469&r2=651470&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletLogger.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletLogger.java Thu Apr 24 17:47:52 2008
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.log.LogSystem;
import org.apache.velocity.tools.view.ServletLogChute;
@@ -36,6 +37,14 @@
@Deprecated
public class ServletLogger extends ServletLogChute implements LogSystem
{
+ @Override
+ public void init(RuntimeServices rs) throws Exception
+ {
+ super.init(rs);
+ log(LogSystem.WARN_ID, "ServletLogger has been deprecated. Use " +
+ super.getClass().getName() + " instead.");
+ }
+
/**
* Send a log message from Velocity.
*/
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java?rev=651470&r1=651469&r2=651470&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java Thu Apr 24 17:47:52 2008
@@ -127,6 +127,9 @@
sessionToolInfo = new ArrayList();
requestToolInfo = new ArrayList();
createSession = true;
+
+ LOG.warn("ServletToolboxManager has been deprecated. Please use "+
+ "org.apache.velocity.tools.ToolboxFactory instead.");
}
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java?rev=651470&r1=651469&r2=651470&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java Thu Apr 24 17:47:52 2008
@@ -19,6 +19,9 @@
* under the License.
*/
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
/**
* @author Nathan Bubna
* @deprecated This has moved to {@link org.apache.velocity.tools.view.VelocityLayoutServlet}
@@ -28,4 +31,13 @@
public class VelocityLayoutServlet
extends org.apache.velocity.tools.view.VelocityLayoutServlet
{
+ @Override
+ public void init(ServletConfig config) throws ServletException
+ {
+ super.init(config);
+
+ getLog().debug(this.getClass().getName() +
+ " has been deprecated. Use " +
+ super.getClass().getName() + " instead.");
+ }
}
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?rev=651470&r1=651469&r2=651470&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java Thu Apr 24 17:47:52 2008
@@ -20,6 +20,8 @@
*/
import org.apache.velocity.tools.view.VelocityView;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
/**
* @deprecated This class has moved to {@link org.apache.velocity.tools.view.VelocityViewServlet}
@@ -40,4 +42,14 @@
*/
protected static final String DEFAULT_TOOLBOX_PATH =
VelocityView.DEPRECATED_USER_TOOLS_PATH;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException
+ {
+ super.init(config);
+
+ getLog().debug(this.getClass().getName() +
+ " has been deprecated. Use " +
+ super.getClass().getName() + " instead.");
+ }
}
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java?rev=651470&r1=651469&r2=651470&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java Thu Apr 24 17:47:52 2008
@@ -20,6 +20,7 @@
*/
import org.apache.velocity.tools.view.WebappResourceLoader;
+import org.apache.commons.collections.ExtendedProperties;
/**
* <p>This is basically an empty subclass of {@link WebappResourceLoader} that exists
@@ -33,4 +34,10 @@
@Deprecated
public class WebappLoader extends WebappResourceLoader
{
+ public void init(ExtendedProperties configuration)
+ {
+ log.warn("WebappLoader is deprecated. Use "+
+ WebappResourceLoader.class.getName()+" instead.");
+ super.init(configuration);
+ }
}