sorry, should have been two commits. Thw pom commit is really the upgrade to velocity whereas the VelocityOutlet commit is for not creating the velocity.log file on running the generator any more, but using log4j as the rest of the generator.
> Author: tfischer > Date: Tue Jul 19 16:05:11 2011 > New Revision: 1148423 > > URL: http://svn.apache.org/viewvc?rev=1148423&view=rev > Log: > upgrade to newest velocity version > > Modified: > db/torque/torque4/trunk/torque-generator/pom.xml > db/torque/torque4/trunk/torque-generator/src/main/java/org/ > apache/torque/generator/template/velocity/VelocityOutlet.java > > Modified: db/torque/torque4/trunk/torque-generator/pom.xml > URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque- > generator/pom.xml?rev=1148423&r1=1148422&r2=1148423&view=diff > ============================================================================== > --- db/torque/torque4/trunk/torque-generator/pom.xml (original) > +++ db/torque/torque4/trunk/torque-generator/pom.xml Tue Jul 19 16:05:11 2011 > @@ -36,9 +36,9 @@ > > <dependencies> > <dependency> > - <groupId>velocity</groupId> > + <groupId>org.apache.velocity</groupId> > <artifactId>velocity</artifactId> > - <version>1.4</version> > + <version>1.7</version> > </dependency> > <dependency> > <groupId>commons-logging</groupId> > > Modified: db/torque/torque4/trunk/torque-generator/src/main/java/ > org/apache/torque/generator/template/velocity/VelocityOutlet.java > URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque- > generator/src/main/java/org/apache/torque/generator/template/ > velocity/VelocityOutlet.java?rev=1148423&r1=1148422&r2=1148423&view=diff > ============================================================================== > --- db/torque/torque4/trunk/torque-generator/src/main/java/org/ > apache/torque/generator/template/velocity/VelocityOutlet.java (original) > +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/ > apache/torque/generator/template/velocity/VelocityOutlet.java Tue > Jul 19 16:05:11 2011 > @@ -21,6 +21,7 @@ package org.apache.torque.generator.temp > > import java.io.StringWriter; > import java.io.Writer; > +import java.util.Properties; > import java.util.Set; > > import org.apache.commons.logging.Log; > @@ -41,6 +42,8 @@ import org.apache.torque.generator.varia > import org.apache.velocity.VelocityContext; > import org.apache.velocity.app.Velocity; > import org.apache.velocity.context.Context; > +import org.apache.velocity.runtime.RuntimeConstants; > +import org.apache.velocity.runtime.log.Log4JLogChute; > import org.apache.velocity.util.StringUtils; > > /** > @@ -210,7 +213,14 @@ public class VelocityOutlet extends Temp > { > try > { > - Velocity.init(); > + Properties properties = new Properties(); > + properties.put( > + RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, > + Log4JLogChute.class.getName()); > + properties.put( > + RuntimeConstants.RUNTIME_LOG, > + ""); > + Velocity.init(properties); > } > catch (Exception e) > { > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
