You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tv...@apache.org on 2007/05/06 17:18:42 UTC
svn commit: r535621 - in /db/torque: generator/trunk/
generator/trunk/src/java/org/apache/torque/task/ maven-plugin/trunk/
maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/
Author: tv
Date: Sun May 6 08:18:41 2007
New Revision: 535621
URL: http://svn.apache.org/viewvc?view=rev&rev=535621
Log:
Added the dependency on velocity/texen and changed the related places
to use the new package. Updated dependendcy to velocity 1.5.
This includes my very first line of Jelly!
Modified:
db/torque/generator/trunk/pom.xml
db/torque/generator/trunk/project.xml
db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java
db/torque/maven-plugin/trunk/plugin.jelly
db/torque/maven-plugin/trunk/project.xml
db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/TexenTaskMojo.java
Modified: db/torque/generator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/pom.xml?view=diff&rev=535621&r1=535620&r2=535621
==============================================================================
--- db/torque/generator/trunk/pom.xml (original)
+++ db/torque/generator/trunk/pom.xml Sun May 6 08:18:41 2007
@@ -74,8 +74,14 @@
<artifactId>velocity</artifactId>
<type>jar</type>
<groupId>velocity</groupId>
- <version>1.3.1</version>
+ <version>1.5</version>
</dependency>
+ <dependency>
+ <artifactId>texen</artifactId>
+ <type>jar</type>
+ <groupId>velocity</groupId>
+ <version>1.0</version>
+ </dependency>
<dependency>
<artifactId>village</artifactId>
<type>jar</type>
Modified: db/torque/generator/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/project.xml?view=diff&rev=535621&r1=535620&r2=535621
==============================================================================
--- db/torque/generator/trunk/project.xml (original)
+++ db/torque/generator/trunk/project.xml Sun May 6 08:18:41 2007
@@ -87,7 +87,17 @@
<artifactId>velocity</artifactId>
<type>jar</type>
<groupId>velocity</groupId>
- <version>1.3.1</version>
+ <version>1.5</version>
+ <url>http://jakarta.apache.org/velocity/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <artifactId>texen</artifactId>
+ <type>jar</type>
+ <groupId>velocity</groupId>
+ <version>1.0</version>
<url>http://jakarta.apache.org/velocity/</url>
<properties>
<dist.bundle>true</dist.bundle>
Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java?view=diff&rev=535621&r1=535620&r2=535621
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java Sun May 6 08:18:41 2007
@@ -36,7 +36,7 @@
import org.apache.torque.engine.database.transform.XmlToAppData;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
-import org.apache.velocity.texen.ant.TexenTask;
+import org.apache.texen.ant.TexenTask;
/**
* A base torque task that uses either a single XML schema
@@ -293,7 +293,7 @@
/**
* Change type of "now" to java.util.Date
*
- * @see org.apache.velocity.texen.ant.TexenTask#populateInitialContext(org.apache.velocity.context.Context)
+ * @see org.apache.texen.ant.TexenTask#populateInitialContext(org.apache.velocity.context.Context)
*/
protected void populateInitialContext(Context context) throws Exception
{
Modified: db/torque/maven-plugin/trunk/plugin.jelly
URL: http://svn.apache.org/viewvc/db/torque/maven-plugin/trunk/plugin.jelly?view=diff&rev=535621&r1=535620&r2=535621
==============================================================================
--- db/torque/maven-plugin/trunk/plugin.jelly (original)
+++ db/torque/maven-plugin/trunk/plugin.jelly Sun May 6 08:18:41 2007
@@ -99,6 +99,7 @@
<pathelement path="${plugin.getDependencyPath('commons-lang')}"/>
<pathelement path="${plugin.getDependencyPath('commons-logging')}"/>
<pathelement path="${plugin.getDependencyPath('velocity')}"/>
+ <pathelement path="${plugin.getDependencyPath('velocity:texen')}"/>
<pathelement path="${plugin.getDependencyPath('village')}"/>
<pathelement path="${plugin.getDependencyPath('xercesImpl')}"/>
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
Modified: db/torque/maven-plugin/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/torque/maven-plugin/trunk/project.xml?view=diff&rev=535621&r1=535620&r2=535621
==============================================================================
--- db/torque/maven-plugin/trunk/project.xml (original)
+++ db/torque/maven-plugin/trunk/project.xml Sun May 6 08:18:41 2007
@@ -88,21 +88,28 @@
<dependency>
<groupId>torque</groupId>
<artifactId>torque-gen</artifactId>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
<url>http://db.apache.org/torque/generator/</url>
</dependency>
<dependency>
<groupId>torque</groupId>
<artifactId>torque-gen-templates</artifactId>
- <version>3.3-RC2</version>
+ <version>3.3-RC3</version>
<url>http://db.apache.org/torque/templates/</url>
</dependency>
<dependency>
<artifactId>velocity</artifactId>
<groupId>velocity</groupId>
- <version>1.3.1</version>
+ <version>1.5</version>
+ <url>http://jakarta.apache.org/velocity/</url>
+ </dependency>
+
+ <dependency>
+ <artifactId>texen</artifactId>
+ <groupId>velocity</groupId>
+ <version>1.0</version>
<url>http://jakarta.apache.org/velocity/</url>
</dependency>
Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/TexenTaskMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/TexenTaskMojo.java?view=diff&rev=535621&r1=535620&r2=535621
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/TexenTaskMojo.java (original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/TexenTaskMojo.java Sun May 6 08:18:41 2007
@@ -30,7 +30,7 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.tools.ant.Project;
-import org.apache.velocity.texen.ant.TexenTask;
+import org.apache.texen.ant.TexenTask;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org