dlr 2004/03/19 19:35:51 Modified: src/java/org/apache/velocity/anakia AnakiaJDOMFactory.java AnakiaTask.java OutputWrapper.java src/java/org/apache/velocity/io VelocityWriter.java src/java/org/apache/velocity/runtime RuntimeConstants.java RuntimeInstance.java src/java/org/apache/velocity/runtime/directive Foreach.java VMProxyArg.java src/java/org/apache/velocity/runtime/log Log4JLogSystem.java SimpleLog4JLogSystem.java src/java/org/apache/velocity/runtime/parser Parser.java ParserConstants.java ParserTokenManager.java ParserTreeConstants.java src/java/org/apache/velocity/runtime/parser/node ASTAddNode.java ASTDirective.java ASTMethod.java src/java/org/apache/velocity/runtime/resource Resource.java ResourceCacheImpl.java ResourceManagerImpl.java src/java/org/apache/velocity/runtime/resource/loader DataSourceResourceLoader.java FileResourceLoader.java src/java/org/apache/velocity/servlet VelocityServlet.java src/java/org/apache/velocity/test BaseTestCase.java VelocityServletTest.java src/java/org/apache/velocity/texen/ant TexenTask.java src/java/org/apache/velocity/util SimplePool.java src/java/org/apache/velocity/util/introspection Info.java UberspectImpl.java whiteboard/geir Delay.java Log: Looks like Jeff went a little too far back before the the previous commit which removed our @author tags to get his baseline for replacing them. Revert the unexpected changes which snuck in from the last patch. We now have a clean build again, and all tests pass. Revision Changes Path 1.6 +2 -2 jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaJDOMFactory.java.diff?r1=1.5&r2=1.6 1.38 +6 -3 jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java.diff?r1=1.37&r2=1.38 1.10 +8 -3 jakarta-velocity/src/java/org/apache/velocity/anakia/OutputWrapper.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/anakia/OutputWrapper.java.diff?r1=1.9&r2=1.10 1.12 +8 -5 jakarta-velocity/src/java/org/apache/velocity/io/VelocityWriter.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/io/VelocityWriter.java.diff?r1=1.11&r2=1.12 1.39 +17 -76 jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeConstants.java.diff?r1=1.38&r2=1.39 1.24 +118 -97 jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeInstance.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/RuntimeInstance.java.diff?r1=1.23&r2=1.24 1.48 +18 -3 jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java.diff?r1=1.47&r2=1.48 1.17 +6 -1 jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java.diff?r1=1.16&r2=1.17 1.14 +68 -154 jakarta-velocity/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java.diff?r1=1.13&r2=1.14 1.10 +8 -1 jakarta-velocity/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java.diff?r1=1.9&r2=1.10 1.84 +504 -332 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java.diff?r1=1.83&r2=1.84 1.26 +70 -64 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserConstants.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserConstants.java.diff?r1=1.25&r2=1.26 1.61 +796 -651 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java.diff?r1=1.60&r2=1.61 1.8 +29 -27 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java.diff?r1=1.7&r2=1.8 1.12 +26 -16 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java.diff?r1=1.11&r2=1.12 1.25 +4 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java.diff?r1=1.24&r2=1.25 1.28 +5 -1 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java.diff?r1=1.27&r2=1.28 1.16 +2 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/Resource.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/Resource.java.diff?r1=1.15&r2=1.16 1.7 +24 -4 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java.diff?r1=1.6&r2=1.7 1.11 +1 -14 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java.diff?r1=1.10&r2=1.11 1.12 +25 -21 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java.diff?r1=1.11&r2=1.12 1.23 +4 -3 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java.diff?r1=1.22&r2=1.23 1.57 +13 -8 jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java.diff?r1=1.56&r2=1.57 1.16 +2 -2 jakarta-velocity/src/java/org/apache/velocity/test/BaseTestCase.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/test/BaseTestCase.java.diff?r1=1.15&r2=1.16 1.6 +16 -0 jakarta-velocity/src/java/org/apache/velocity/test/VelocityServletTest.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/test/VelocityServletTest.java.diff?r1=1.5&r2=1.6 1.44 +129 -81 jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/texen/ant/TexenTask.java.diff?r1=1.43&r2=1.44 1.5 +21 -20 jakarta-velocity/src/java/org/apache/velocity/util/SimplePool.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/util/SimplePool.java.diff?r1=1.4&r2=1.5 1.5 +23 -5 jakarta-velocity/src/java/org/apache/velocity/util/introspection/Info.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/Info.java.diff?r1=1.4&r2=1.5 1.6 +22 -26 jakarta-velocity/src/java/org/apache/velocity/util/introspection/UberspectImpl.java http://cvs.apache.org/viewcvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/UberspectImpl.java.diff?r1=1.5&r2=1.6 1.4 +1 -1 jakarta-velocity/whiteboard/geir/Delay.java http://cvs.apache.org/viewcvs/jakarta-velocity/whiteboard/geir/Delay.java.diff?r1=1.3&r2=1.4
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]