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/10/31 23:12:12 UTC
svn commit: r590850 - in /db/torque: generator/trunk/project.xml
runtime/trunk/project.xml trunks/maven.xml village/trunk/project.properties
Author: tv
Date: Wed Oct 31 15:12:12 2007
New Revision: 590850
URL: http://svn.apache.org/viewvc?rev=590850&view=rev
Log:
Integrated build of village
Modified:
db/torque/generator/trunk/project.xml
db/torque/runtime/trunk/project.xml
db/torque/trunks/maven.xml
db/torque/village/trunk/project.properties
Modified: db/torque/generator/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/project.xml?rev=590850&r1=590849&r2=590850&view=diff
==============================================================================
--- db/torque/generator/trunk/project.xml (original)
+++ db/torque/generator/trunk/project.xml Wed Oct 31 15:12:12 2007
@@ -84,31 +84,31 @@
</properties>
</dependency>
<dependency>
- <artifactId>velocity</artifactId>
+ <groupId>torque</groupId>
+ <artifactId>village</artifactId>
+ <version>${pom.currentVersion}</version>
<type>jar</type>
- <groupId>velocity</groupId>
- <version>1.5</version>
- <url>http://jakarta.apache.org/velocity/</url>
+ <url>http://db.apache.org/torque/</url>
<properties>
<dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
- <artifactId>texen</artifactId>
+ <artifactId>velocity</artifactId>
<type>jar</type>
<groupId>velocity</groupId>
- <version>1.0</version>
+ <version>1.5</version>
<url>http://jakarta.apache.org/velocity/</url>
<properties>
<dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
- <artifactId>village</artifactId>
+ <artifactId>texen</artifactId>
<type>jar</type>
- <groupId>village</groupId>
- <version>2.0</version>
- <url>http://www.softwareforge.de/projects/village</url>
+ <groupId>velocity</groupId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/velocity/</url>
<properties>
<dist.bundle>true</dist.bundle>
</properties>
Modified: db/torque/runtime/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/project.xml?rev=590850&r1=590849&r2=590850&view=diff
==============================================================================
--- db/torque/runtime/trunk/project.xml (original)
+++ db/torque/runtime/trunk/project.xml Wed Oct 31 15:12:12 2007
@@ -158,11 +158,11 @@
<url>http://java.sun.com/products/jndi/</url>
</dependency>
<dependency>
- <groupId>village</groupId>
+ <groupId>torque</groupId>
<artifactId>village</artifactId>
- <version>2.0</version>
+ <version>${pom.currentVersion}</version>
<type>jar</type>
- <url>http://www.softwareforge.de/projects/village</url>
+ <url>http://db.apache.org/torque/</url>
<properties>
<dist.bundle>true</dist.bundle>
</properties>
Modified: db/torque/trunks/maven.xml
URL: http://svn.apache.org/viewvc/db/torque/trunks/maven.xml?rev=590850&r1=590849&r2=590850&view=diff
==============================================================================
--- db/torque/trunks/maven.xml (original)
+++ db/torque/trunks/maven.xml Wed Oct 31 15:12:12 2007
@@ -54,6 +54,7 @@
<attainGoal name="copy-runtime-docs"/>
<attainGoal name="copy-plugin1-docs"/>
<attainGoal name="copy-tutorial-docs"/>
+ <attainGoal name="copy-village-docs"/>
</postGoal>
<goal name="site:deploy" description="Build and deploy the maven site for all Torque Modules">
@@ -101,6 +102,14 @@
<goal name="copy-tutorial-docs" description="Copy generated docs to target directory">
<ant:copy todir="${basedir}/site/target/docs/releases/torque-3.3/tutorial">
<ant:fileset dir="${basedir}/tutorial/target/docs">
+ <ant:include name="**/*"/>
+ </ant:fileset>
+ </ant:copy>
+ </goal>
+
+ <goal name="copy-village-docs" description="Copy generated docs to target directory">
+ <ant:copy todir="${basedir}/site/target/docs/releases/torque-3.3/village">
+ <ant:fileset dir="${basedir}/village/target/docs">
<ant:include name="**/*"/>
</ant:fileset>
</ant:copy>
Modified: db/torque/village/trunk/project.properties
URL: http://svn.apache.org/viewvc/db/torque/village/trunk/project.properties?rev=590850&r1=590849&r2=590850&view=diff
==============================================================================
--- db/torque/village/trunk/project.properties (original)
+++ db/torque/village/trunk/project.properties Wed Oct 31 15:12:12 2007
@@ -31,7 +31,9 @@
# display the date on the site
+maven.xdoc.includeProjectDocumentation = no
maven.xdoc.date = left
maven.xdoc.locale.default = en
+
# Display the version the web site is documenting
maven.xdoc.version = ${pom.currentVersion}
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org