velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ValueParser.java (2 lines):
	- line 43: * TODO: someone doing java configuration ought to be able to put a source Map
	- line 777: return getSource().put(key,value); // TODO this tool should be made thread-safe (the request-scoped ParameterTool doesn't need it, but other uses could...)


velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java (2 lines):
	- line 119: //TODO: fix escaped delimiters
	- line 362: //TODO: match attributes


velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java (2 lines):
	- line 558: //FIXME: log this
	- line 592: //TODO: make it optional whether or not case is ignored


velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java (2 lines):
	- line 779: catch (RuntimeException e)  // FIXME This is useless with Velocity 1.7
	- line 783: catch (Exception e)  // FIXME This is useless with Velocity 1.7


velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java (1 line):
	- line 475: //TODO: add line/column/template info for parse errors et al


velocity-tools-generic/src/main/java/org/apache/velocity/tools/ToolboxFactory.java (1 line):
	- line 246: //TODO: this will waste cycles on subsequent retrievals


velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java (1 line):
	- line 82: * <p>TODO:</p>


velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ContextTool.java (1 line):
	- line 167: //TODO: this could be a lot more efficient


velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java (1 line):
	- line 382: //TODO: look for a getConfiguration() method


velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java (1 line):
	- line 553: //TODO: replace this method with ConversionUtils.toURL(file, this)


velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ServletUtils.java (1 line):
	- line 492: // TODO - it should be factorize somewhere in generics tools.


velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationCleaner.java (1 line):
	- line 106: //TODO: loop on validate() until all debug scoped tools are removed