Author: nbubna
Date: Thu Feb 5 18:13:47 2009
New Revision: 741214
URL: http://svn.apache.org/viewvc?rev=741214&view=rev
Log:
remove misc deprecated classes and methods
Removed:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/tools/
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/Runtime.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeLogger.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/RuntimeLoggerLog.java
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/Velocity.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/VelocityEngine.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeConstants.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeInstance.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeServices.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeSingleton.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/CharStream.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/StringUtils.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/Introspector.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/Velocity.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/Velocity.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/Velocity.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/Velocity.java
Thu Feb 5 18:13:47 2009
@@ -184,53 +184,6 @@
}
/**
- * Renders the input stream using the context into the output writer.
- * To be used when a template is dynamically constructed, or want to
- * use Velocity as a token replacer.
- *
- * @param context context to use in rendering input string
- * @param writer Writer in which to render the output
- * @param logTag string to be used as the template name for log messages
- * in case of error
- * @param instream input stream containing the VTL to be rendered
- *
- * @return true if successful, false otherwise. If false, see
- * Velocity runtime log
- * @deprecated Use
- * {...@link #evaluate( Context context, Writer writer,
- * String logTag, Reader reader ) }
- * @throws ParseErrorException The template could not be parsed.
- * @throws MethodInvocationException A method on a context object could
not be invoked.
- * @throws ResourceNotFoundException A referenced resource could not be
loaded.
- * @throws IOException While loading a reference, an I/O problem occured.
- */
- public static boolean evaluate( Context context, Writer writer,
- String logTag, InputStream instream )
- throws ParseErrorException, MethodInvocationException,
- ResourceNotFoundException
- {
- /*
- * first, parse - convert ParseException if thrown
- */
- BufferedReader br = null;
- String encoding = null;
-
- try
- {
- encoding =
RuntimeSingleton.getString(INPUT_ENCODING,ENCODING_DEFAULT);
- br = new BufferedReader( new InputStreamReader( instream,
encoding));
- }
- catch( UnsupportedEncodingException uce )
- {
- String msg = "Unsupported input encoding : " + encoding
- + " for template " + logTag;
- throw new ParseErrorException( msg );
- }
-
- return evaluate( context, writer, logTag, br );
- }
-
- /**
* Renders the input reader using the context into the output writer.
* To be used when a template is dynamically constructed, or want to
* use Velocity as a token replacer.
@@ -281,33 +234,6 @@
}
/**
- * Merges a template and puts the rendered stream into the writer.
- * The default encoding that Velocity uses to read template files is
defined in
- * the property input.encoding and defaults to ISO-8859-1.
- *
- * @param templateName name of template to be used in merge
- * @param context filled context to be used in merge
- * @param writer writer to write template into
- *
- * @return true if successful, false otherwise. Errors
- * logged to velocity log.
- * @deprecated Use
- * {...@link #mergeTemplate( String templateName, String encoding,
- * Context context, Writer writer )}
- * @throws ParseErrorException The template could not be parsed.
- * @throws MethodInvocationException A method on a context object could
not be invoked.
- * @throws ResourceNotFoundException A referenced resource could not be
loaded.
- * @throws Exception Any other exception.
- */
- public static boolean mergeTemplate( String templateName,
- Context context, Writer writer )
- throws ResourceNotFoundException, ParseErrorException,
MethodInvocationException
- {
- return mergeTemplate( templateName,
RuntimeSingleton.getString(INPUT_ENCODING,ENCODING_DEFAULT),
- context, writer );
- }
-
- /**
* merges a template and puts the rendered stream into the writer
*
* @param templateName name of template to be used in merge
@@ -416,46 +342,6 @@
}
/**
- * @deprecated Use getLog() and call warn() on it.
- * @see Log#warn(Object)
- * @param message The message to log.
- */
- public static void warn(Object message)
- {
- getLog().warn( message );
- }
-
- /**
- * @deprecated Use getLog() and call info() on it.
- * @see Log#info(Object)
- * @param message The message to log.
- */
- public static void info(Object message)
- {
- getLog().info( message );
- }
-
- /**
- * @deprecated Use getLog() and call error() on it.
- * @see Log#error(Object)
- * @param message The message to log.
- */
- public static void error(Object message)
- {
- getLog().error( message );
- }
-
- /**
- * @deprecated Use getLog() and call debug() on it.
- * @see Log#debug(Object)
- * @param message The message to log.
- */
- public static void debug(Object message)
- {
- getLog().debug( message );
- }
-
- /**
* <p>
* Set the an ApplicationAttribue, which is an Object
* set by the application which is accessable from
@@ -478,17 +364,7 @@
*/
public static void setApplicationAttribute( Object key, Object value )
{
- RuntimeSingleton.getRuntimeInstance().setApplicationAttribute( key,
value);
+ RuntimeSingleton.getRuntimeServices().setApplicationAttribute( key,
value);
}
- /**
- * @param resourceName Name of the Template to check.
- * @return True if the template exists.
- * @see #resourceExists(String)
- * @deprecated Use resourceExists(String) instead.
- */
- public static boolean templateExists(String resourceName)
- {
- return resourceExists(resourceName);
- }
}
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/VelocityEngine.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/VelocityEngine.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/VelocityEngine.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/app/VelocityEngine.java
Thu Feb 5 18:13:47 2009
@@ -200,53 +200,6 @@
}
/**
- * Renders the input stream using the context into the output writer.
- * To be used when a template is dynamically constructed, or want to
- * use Velocity as a token replacer.
- *
- * @param context context to use in rendering input string
- * @param writer Writer in which to render the output
- * @param logTag string to be used as the template name for log messages
- * in case of error
- * @param instream input stream containing the VTL to be rendered
- *
- * @return true if successful, false otherwise. If false, see
- * Velocity runtime log
- * @throws ParseErrorException
- * @throws MethodInvocationException
- * @throws ResourceNotFoundException
- * @throws IOException
- * @deprecated Use
- * {...@link #evaluate( Context context, Writer writer,
- * String logTag, Reader reader ) }
- */
- public boolean evaluate( Context context, Writer writer,
- String logTag, InputStream instream )
- throws ParseErrorException, MethodInvocationException,
- ResourceNotFoundException, IOException
- {
- /*
- * first, parse - convert ParseException if thrown
- */
- BufferedReader br = null;
- String encoding = null;
-
- try
- {
- encoding = ri.getString(INPUT_ENCODING,ENCODING_DEFAULT);
- br = new BufferedReader( new InputStreamReader( instream,
encoding));
- }
- catch( UnsupportedEncodingException uce )
- {
- String msg = "Unsupported input encoding : " + encoding
- + " for template " + logTag;
- throw new ParseErrorException( msg );
- }
-
- return evaluate( context, writer, logTag, br );
- }
-
- /**
* Renders the input reader using the context into the output writer.
* To be used when a template is dynamically constructed, or want to
* use Velocity as a token replacer.
@@ -296,32 +249,6 @@
}
/**
- * Merges a template and puts the rendered stream into the writer.
- * The default encoding that Velocity uses to read template files is
defined in
- * the property input.encoding and defaults to ISO-8859-1.
- *
- * @param templateName name of template to be used in merge
- * @param context filled context to be used in merge
- * @param writer writer to write template into
- *
- * @return true if successful, false otherwise. Errors
- * logged to velocity log.
- * @throws ResourceNotFoundException
- * @throws ParseErrorException
- * @throws MethodInvocationException
- * @deprecated Use
- * {...@link #mergeTemplate( String templateName, String encoding,
- * Context context, Writer writer )}
- */
- public boolean mergeTemplate( String templateName,
- Context context, Writer writer )
- throws ResourceNotFoundException, ParseErrorException,
MethodInvocationException
- {
- return mergeTemplate( templateName,
ri.getString(INPUT_ENCODING,ENCODING_DEFAULT),
- context, writer );
- }
-
- /**
* merges a template and puts the rendered stream into the writer
*
* @param templateName name of template to be used in merge
@@ -414,18 +341,6 @@
}
/**
- * @param resourceName
- * @return True if the template exists.
- * @see #resourceExists(String)
- * @deprecated Use resourceExists(String) instead.
- */
- public boolean templateExists(String resourceName)
- {
- return resourceExists(resourceName);
- }
-
-
- /**
* Returns a convenient Log instance that wraps the current LogChute.
* Use this to log error messages. It has the usual methods you'd expect.
* @return A log object.
@@ -437,42 +352,6 @@
}
/**
- * @param message
- * @deprecated Use getLog() and call warn() on it.
- */
- public void warn(Object message)
- {
- getLog().warn(message);
- }
-
- /**
- * @param message
- * @deprecated Use getLog() and call warn() on it.
- */
- public void info(Object message)
- {
- getLog().info(message);
- }
-
- /**
- * @param message
- * @deprecated Use getLog() and call warn() on it.
- */
- public void error(Object message)
- {
- getLog().error(message);
- }
-
- /**
- * @param message
- * @deprecated Use getLog() and call warn() on it.
- */
- public void debug(Object message)
- {
- getLog().debug(message);
- }
-
- /**
* <p>
* Sets an application attribute (which can be any Object) that will be
* accessible from any component of the system that gets a
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeConstants.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeConstants.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeConstants.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeConstants.java
Thu Feb 5 18:13:47 2009
@@ -62,55 +62,10 @@
* Indicates we are going to use modifed escape behavior in strict mode
*/
String RUNTIME_REFERENCES_STRICT_ESCAPE =
"runtime.references.strict.escape";
-
- /**
- * @deprecated This appears to have always been meaningless.
- */
- String RUNTIME_LOG_ERROR_STACKTRACE = "runtime.log.error.stacktrace";
-
- /**
- * @deprecated The functionality this controlled is confusing and no
longer necessary.
- */
- String RUNTIME_LOG_WARN_STACKTRACE = "runtime.log.warn.stacktrace";
-
- /**
- * @deprecated This appears to have always been meaningless.
- */
- String RUNTIME_LOG_INFO_STACKTRACE = "runtime.log.info.stacktrace";
/** Logging of invalid references. */
String RUNTIME_LOG_REFERENCE_LOG_INVALID =
"runtime.log.invalid.references";
- /**
- * @deprecated Use LogChute.TRACE_PREFIX instead
- */
- String TRACE_PREFIX = " [trace] ";
-
- /**
- * @deprecated Use LogChute.DEBUG_PREFIX instead
- */
- String DEBUG_PREFIX = " [debug] ";
-
- /**
- * @deprecated Use LogChute.INFO_PREFIX instead
- */
- String INFO_PREFIX = " [info] ";
-
- /**
- * @deprecated Use LogChute.WARN_PREFIX instead
- */
- String WARN_PREFIX = " [warn] ";
-
- /**
- * @deprecated Use LogChute.ERROR_PREFIX instead
- */
- String ERROR_PREFIX = " [error] ";
-
- /**
- * @deprecated This will be removed in a future version
- */
- String UNKNOWN_PREFIX = " [unknown] ";
-
/*
* ----------------------------------------------------------------------
* D I R E C T I V E C O N F I G U R A T I O N
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeInstance.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeInstance.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeInstance.java
Thu Feb 5 18:13:47 2009
@@ -244,7 +244,7 @@
initializing = true;
log.trace("*******************************************************************");
- log.debug("Starting Apache Velocity [email protected]@ (compiled:
@build.time@)");
+ log.debug("Starting Apache Velocity v2.0-dev (compiled: 2009-02-05
07:40:05)");
log.trace("RuntimeInstance initializing.");
initializeProperties();
@@ -1554,46 +1554,6 @@
}
/**
- * @deprecated Use getLog() and call warn() on it.
- * @see Log#warn(Object)
- * @param message The message to log.
- */
- public void warn(Object message)
- {
- getLog().warn(message);
- }
-
- /**
- * @deprecated Use getLog() and call info() on it.
- * @see Log#info(Object)
- * @param message The message to log.
- */
- public void info(Object message)
- {
- getLog().info(message);
- }
-
- /**
- * @deprecated Use getLog() and call error() on it.
- * @see Log#error(Object)
- * @param message The message to log.
- */
- public void error(Object message)
- {
- getLog().error(message);
- }
-
- /**
- * @deprecated Use getLog() and call debug() on it.
- * @see Log#debug(Object)
- * @param message The message to log.
- */
- public void debug(Object message)
- {
- getLog().debug(message);
- }
-
- /**
* String property accessor method with default to hide the
* configuration implementation.
*
@@ -1639,29 +1599,6 @@
{
return vmFactory.getVelocimacro( vmName, templateName,
renderingTemplate );
}
-
-
- /**
- * Adds a new Velocimacro. Usually called by Macro only while parsing.
- *
- * @param name Name of velocimacro
- * @param macro String form of macro body
- * @param argArray Array of strings, containing the
- * #macro() arguments. the 0th is the name.
- * @param sourceTemplate Name of the template that contains the velocimacro.
- *
- * @deprecated Use addVelocimacro(String, Node, String[], String) instead
- *
- * @return True if added, false if rejected for some
- * reason (either parameters or permission settings)
- */
- public boolean addVelocimacro( String name,
- String macro,
- String argArray[],
- String sourceTemplate )
- {
- return vmFactory.addVelocimacro(name.intern(), macro, argArray,
sourceTemplate);
- }
/**
* Adds a new Velocimacro. Usually called by Macro only while parsing.
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeServices.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeServices.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeServices.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeServices.java
Thu Feb 5 18:13:47 2009
@@ -51,7 +51,7 @@
* @author <a href="mailto:[email protected]";>Geir Magusson Jr.</a>
* @version $Id$
*/
-public interface RuntimeServices extends RuntimeLogger
+public interface RuntimeServices
{
/**
@@ -360,25 +360,6 @@
*/
public Directive getVelocimacro( String vmName, String templateName,
String renderingTemplate );
- /**
- * Adds a new Velocimacro. Usually called by Macro only while parsing.
- *
- * @param name Name of velocimacro
- * @param macro String form of macro body
- * @param argArray Array of strings, containing the
- * #macro() arguments. the 0th is the name.
- * @param sourceTemplate
- *
- * @deprecated Use addVelocimacro(String, Node, String[], String) instead
- *
- * @return boolean True if added, false if rejected for some
- * reason (either parameters or permission settings)
- */
- public boolean addVelocimacro( String name,
- String macro,
- String argArray[],
- String sourceTemplate );
-
/**
* Adds a new Velocimacro. Usually called by Macro only while parsing.
*
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeSingleton.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeSingleton.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeSingleton.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/RuntimeSingleton.java
Thu Feb 5 18:13:47 2009
@@ -385,46 +385,6 @@
}
/**
- * @deprecated Use getLog() and call warn() on it.
- * @see Log#warn(Object)
- * @param message The message to log.
- */
- public static void warn(Object message)
- {
- getLog().warn(message);
- }
-
- /**
- * @deprecated Use getLog() and call info() on it.
- * @see Log#info(Object)
- * @param message The message to log.
- */
- public static void info(Object message)
- {
- getLog().info(message);
- }
-
- /**
- * @deprecated Use getLog() and call error() on it.
- * @see Log#error(Object)
- * @param message The message to log.
- */
- public static void error(Object message)
- {
- getLog().error(message);
- }
-
- /**
- * @deprecated Use getLog() and call debug() on it.
- * @see Log#debug(Object)
- * @param message The message to log.
- */
- public static void debug(Object message)
- {
- getLog().debug(message);
- }
-
- /**
* String property accessor method with default to hide the
* configuration implementation.
*
@@ -472,29 +432,6 @@
return ri.addVelocimacro(name, macro, argArray, sourceTemplate);
}
- /**
- * Adds a new Velocimacro. Usually called by Macro only while parsing.
- *
- * @param name Name of velocimacro
- * @param macro String form of macro body
- * @param argArray Array of strings, containing the
- * #macro() arguments. the 0th is the name.
- * @param sourceTemplate Name of the template that contains the velocimacro.
- * @return True if added, false if rejected for some
- * reason (either parameters or permission settings)
- *
- * @deprecated Use addVelocimacro(String, Node, String[], String) instead
- *
- * @see RuntimeInstance#addVelocimacro(String, String, String[], String)
- */
- public static boolean addVelocimacro( String name,
- String macro,
- String argArray[],
- String sourceTemplate )
- {
- return ri.addVelocimacro( name, macro, argArray, sourceTemplate );
- }
-
/**
* Checks to see if a VM exists
*
@@ -640,12 +577,4 @@
return ri.getUberspect();
}
- /**
- * @deprecated Use getRuntimeServices() instead.
- * @return The RuntimeInstance used by this Singleton.
- */
- public static RuntimeInstance getRuntimeInstance()
- {
- return ri;
- }
}
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
Thu Feb 5 18:13:47 2009
@@ -121,21 +121,6 @@
}
/**
- * @param file
- * @throws Exception
- * @deprecated This method should not be used. It is here only to provide
- * backwards compatibility for the deprecated AvalonLogSystem
- * class, in case anyone used it and this method directly.
- */
- public void init(String file) throws Exception
- {
- logger = Hierarchy.getDefaultHierarchy().getLoggerFor(rsvc.toString());
- initTarget(file, null);
- // nag the theoretical user
- log(DEBUG_ID, "You shouldn't be using the init(String file) method!");
- }
-
- /**
* logs messages
*
* @param level severity level
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/CharStream.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/CharStream.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/CharStream.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/CharStream.java
Thu Feb 5 18:13:47 2009
@@ -26,20 +26,6 @@
char readChar() throws java.io.IOException;
/**
- * Returns the column position of the character last read.
- * @deprecated
- * @see #getEndColumn
- */
- int getColumn();
-
- /**
- * Returns the line number of the character last read.
- * @deprecated
- * @see #getEndLine
- */
- int getLine();
-
- /**
* Returns the column number of the last character for current token (being
* matched after the last call to BeginTOken).
*/
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/VelocityCharStream.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
Thu Feb 5 18:13:47 2009
@@ -256,24 +256,6 @@
}
/**
- * @see org.apache.velocity.runtime.parser.CharStream#getColumn()
- * @deprecated
- */
- public final int getColumn()
- {
- return bufcolumn[bufpos];
- }
-
- /**
- * @see org.apache.velocity.runtime.parser.CharStream#getLine()
- * @deprecated
- */
- public final int getLine()
- {
- return bufline[bufpos];
- }
-
- /**
* @see org.apache.velocity.runtime.parser.CharStream#getEndColumn()
*/
public final int getEndColumn()
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
Thu Feb 5 18:13:47 2009
@@ -20,9 +20,7 @@
*/
import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.RuntimeLogger;
import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.log.RuntimeLoggerLog;
import org.apache.velocity.util.introspection.Introspector;
/**
@@ -53,19 +51,6 @@
super(log, introspector, clazz, property);
}
- /**
- * @param rlog
- * @param introspector
- * @param clazz
- * @param property
- * @deprecated RuntimeLogger is deprecated. Use the other constructor.
- */
- public BooleanPropertyExecutor(final RuntimeLogger rlog, final
Introspector introspector,
- final Class clazz, final String property)
- {
- super(new RuntimeLoggerLog(rlog), introspector, clazz, property);
- }
-
protected void discover(final Class clazz, final String property)
{
try
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/GetExecutor.java
Thu Feb 5 18:13:47 2009
@@ -21,9 +21,7 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.RuntimeLogger;
import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.log.RuntimeLoggerLog;
import org.apache.velocity.util.introspection.Introspector;
@@ -72,19 +70,6 @@
}
/**
- * @param rlog
- * @param introspector
- * @param clazz
- * @param property
- * @deprecated RuntimeLogger is deprecated. Use the other constructor.
- */
- public GetExecutor(final RuntimeLogger rlog, final Introspector
introspector,
- final Class clazz, final String property)
- {
- this(new RuntimeLoggerLog(rlog), introspector, clazz, property);
- }
-
- /**
* @since 1.5
*/
protected void discover(final Class clazz)
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/NodeUtils.java
Thu Feb 5 18:13:47 2009
@@ -35,18 +35,6 @@
public class NodeUtils
{
/**
- * @deprecated use getSpecialText(Token t)
- */
- public static String specialText(Token t)
- {
- if (t.specialToken == null || t.specialToken.image.startsWith("##") )
- {
- return "";
- }
- return getSpecialText(t).toString();
- }
-
- /**
* Collect all the <SPECIAL_TOKEN>s that
* are carried along with a token. Special
* tokens do not participate in parsing but
@@ -161,71 +149,4 @@
return t.image;
}
}
-
- /**
- * Utility method to interpolate context variables
- * into string literals. So that the following will
- * work:
- *
- * #set $name = "candy"
- * $image.getURI("${name}.jpg")
- *
- * And the string literal argument will
- * be transformed into "candy.jpg" before
- * the method is executed.
- *
- * @deprecated this method isn't called by any class
- *
- * @param argStr
- * @param vars
- * @return Interpoliation result.
- * @throws MethodInvocationException
- */
- public static String interpolate(String argStr, Context vars) throws
MethodInvocationException
- {
- // if there's nothing to replace, skip this (saves buffer allocation)
- if( argStr.indexOf('$') == -1 )
- return argStr;
-
- StrBuilder argBuf = new StrBuilder();
-
- for (int cIdx = 0, is = argStr.length(); cIdx < is;)
- {
- char ch = argStr.charAt(cIdx);
-
- if( ch == '$' )
- {
- StrBuilder nameBuf = new StrBuilder();
- for (++cIdx ; cIdx < is; ++cIdx)
- {
- ch = argStr.charAt(cIdx);
- if (ch == '_' || ch == '-'
- || Character.isLetterOrDigit(ch))
- nameBuf.append(ch);
- else if (ch == '{' || ch == '}')
- continue;
- else
- break;
- }
-
- if (nameBuf.length() > 0)
- {
- Object value = vars.get(nameBuf.toString());
-
- if (value == null)
- argBuf.append("$").append(nameBuf.toString());
- else
- argBuf.append(value.toString());
- }
-
- }
- else
- {
- argBuf.append(ch);
- ++cIdx;
- }
- }
-
- return argBuf.toString();
- }
}
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
Thu Feb 5 18:13:47 2009
@@ -23,9 +23,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.RuntimeLogger;
import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.log.RuntimeLoggerLog;
import org.apache.velocity.util.introspection.Introspector;
/**
@@ -58,19 +56,6 @@
}
/**
- * @param r
- * @param introspector
- * @param clazz
- * @param property
- * @deprecated RuntimeLogger is deprecated. Use the other constructor.
- */
- public PropertyExecutor(final RuntimeLogger r, final Introspector
introspector,
- final Class clazz, final String property)
- {
- this(new RuntimeLoggerLog(r), introspector, clazz, property);
- }
-
- /**
* @return The current introspector.
* @since 1.5
*/
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
Thu Feb 5 18:13:47 2009
@@ -563,29 +563,6 @@
}
/**
- * Gets the named resource. Returned class type corresponds to specified
type (i.e. <code>Template</code> to <code>
- * RESOURCE_TEMPLATE</code>).
- *
- * @param resourceName The name of the resource to retrieve.
- * @param resourceType The type of resource
(<code>RESOURCE_TEMPLATE</code>, <code>RESOURCE_CONTENT</code>, etc.).
- *
- * @return Resource with the template parsed and ready.
- *
- * @throws ResourceNotFoundException if template not found from any
available source.
- * @throws ParseErrorException if template cannot be parsed due to
syntax (or other) error.
- * @throws Exception if a problem in parse
- *
- * @deprecated Use {...@link #getResource(String resourceName, int
resourceType, String encoding )}
- */
- public Resource getResource(String resourceName, int resourceType)
- throws ResourceNotFoundException,
- ParseErrorException,
- Exception
- {
- return getResource(resourceName, resourceType,
RuntimeConstants.ENCODING_DEFAULT);
- }
-
- /**
* Determines if a template exists, and returns name of the loader that
provides it. This is a slightly less hokey way to
* support the Velocity.templateExists() utility method, which was broken
when per-template encoding was introduced. We can
* revisit this.
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
Thu Feb 5 18:13:47 2009
@@ -92,23 +92,6 @@
Vector paths = configuration.getVector("path");
StringUtils.trimStrings(paths);
- /*
- * support the old version but deprecate with a log message
- */
-
- if( paths == null || paths.size() == 0)
- {
- paths = configuration.getVector("resource.path");
- StringUtils.trimStrings(paths);
-
- if (paths != null && paths.size() > 0)
- {
- log.debug("JarResourceLoader : you are using a deprecated
configuration"
- + " property for the JarResourceLoader ->
'<name>.resource.loader.resource.path'."
- + " Please change to the conventional
'<name>.resource.loader.path'.");
- }
- }
-
if (paths != null)
{
log.debug("JarResourceLoader # of paths : " + paths.size() );
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/StringUtils.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/StringUtils.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/StringUtils.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/StringUtils.java
Thu Feb 5 18:13:47 2009
@@ -79,40 +79,6 @@
/**
* <p>
- * Remove underscores from a string and replaces first
- * letters with capitals. Other letters are changed to lower case.
- * </p>
- *
- * <p>
- * For example <code>foo_bar</code> becomes <code>FooBar</code>
- * but <code>foo_barBar</code> becomes <code>FooBarbar</code>.
- * </p>
- *
- * @param data string to remove underscores from.
- * @return String
- * @deprecated Use the org.apache.commons.util.StringUtils class
- * instead. Using its firstLetterCaps() method in conjunction
- * with a StringTokenizer will achieve the same result.
- */
- static public String removeUnderScores (String data)
- {
- String temp = null;
- StringBuffer out = new StringBuffer();
- temp = data;
-
- StringTokenizer st = new StringTokenizer(temp, "_");
-
- while (st.hasMoreTokens())
- {
- String element = (String) st.nextElement();
- out.append ( firstLetterCaps(element));
- }
-
- return out.toString();
- }
-
- /**
- * <p>
* 'Camels Hump' replacement of underscores.
* </p>
*
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/Introspector.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/Introspector.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/Introspector.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/Introspector.java
Thu Feb 5 18:13:47 2009
@@ -21,9 +21,7 @@
import java.lang.reflect.Method;
-import org.apache.velocity.runtime.RuntimeLogger;
import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.log.RuntimeLoggerLog;
/**
* This basic function of this class is to return a Method
@@ -66,15 +64,6 @@
}
/**
- * @param logger A runtime logger object.
- * @deprecated RuntimeLogger is deprecated. Use Introspector(Log log).
- */
- public Introspector(final RuntimeLogger logger)
- {
- this(new RuntimeLoggerLog(logger));
- }
-
- /**
* Gets the method defined by <code>name</code> and
* <code>params</code> for the Class <code>c</code>.
*
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
Thu Feb 5 18:13:47 2009
@@ -28,9 +28,7 @@
import java.util.Map;
import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.runtime.RuntimeLogger;
import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.log.RuntimeLoggerLog;
import org.apache.velocity.runtime.parser.node.AbstractExecutor;
import org.apache.velocity.runtime.parser.node.BooleanPropertyExecutor;
import org.apache.velocity.runtime.parser.node.GetExecutor;
@@ -87,17 +85,6 @@
}
/**
- * @param runtimeLogger
- * @deprecated Use setLog(Log log) instead.
- */
- public void setRuntimeLogger(RuntimeLogger runtimeLogger)
- {
- // in the off chance anyone still uses this method
- // directly, use this hack to keep it working
- setLog(new RuntimeLoggerLog(runtimeLogger));
- }
-
- /**
* To support iterative objects used in a <code>#foreach()</code>
* loop.
*
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java?rev=741214&r1=741213&r2=741214&view=diff
==============================================================================
---
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java
(original)
+++
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/util/introspection/UberspectLoggable.java
Thu Feb 5 18:13:47 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import org.apache.velocity.runtime.RuntimeLogger;
import org.apache.velocity.runtime.log.Log;
/**
@@ -43,9 +42,4 @@
*/
public void setLog(Log log);
- /**
- * @param logger
- * @deprecated Use setLog(Log log) instead.
- */
- public void setRuntimeLogger(RuntimeLogger logger);
}
