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 tf...@apache.org on 2012/12/01 12:49:35 UTC
svn commit: r1415983 - in /db/torque/torque4/trunk: pom.xml
torque-site/pom.xml torque-site/src/ant/ torque-site/src/ant/build.xml
Author: tfischer
Date: Sat Dec 1 11:49:34 2012
New Revision: 1415983
URL: http://svn.apache.org/viewvc?rev=1415983&view=rev
Log:
TORQUE-237 implement packaging of offline docs
Added:
db/torque/torque4/trunk/torque-site/src/ant/
db/torque/torque4/trunk/torque-site/src/ant/build.xml
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-site/pom.xml
Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1415983&r1=1415982&r2=1415983&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Sat Dec 1 11:49:34 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>11</version>
</parent>
<groupId>org.apache.torque</groupId>
@@ -325,9 +325,10 @@
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
+ <id>attach-sources</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
@@ -524,6 +525,23 @@
<torque.database.shutdown.url>jdbc:derby:torque-test/target/bookstore;shutdown=true</torque.database.shutdown.url>
<torque.database.shutdown.skip>false</torque.database.shutdown.skip>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site-for-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>test</id>
Modified: db/torque/torque4/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/pom.xml?rev=1415983&r1=1415982&r2=1415983&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/pom.xml (original)
+++ db/torque/torque4/trunk/torque-site/pom.xml Sat Dec 1 11:49:34 2012
@@ -93,80 +93,9 @@
<id>process-other-sites</id>
<phase>pre-site</phase>
<configuration>
- <tasks>
- <mkdir dir="${basedir}/target/runtime-site" />
- <mkdir dir="${basedir}/target/generator-site" />
- <mkdir dir="${basedir}/target/templates-site" />
- <mkdir dir="${basedir}/target/maven-plugin-site" />
- <mkdir dir="${basedir}/target/ant-tasks-site" />
- <copy todir="${basedir}/target/runtime-site">
- <fileset dir="${basedir}/../torque-runtime/target/site">
- <include name="*.html" />
- </fileset>
- <mapper type="glob" from="*.html" to="*.xml" />
- </copy>
- <copy todir="${basedir}/target/generator-site">
- <fileset dir="${basedir}/../torque-generator/target/site">
- <include name="*.html" />
- </fileset>
- <mapper type="glob" from="*.html" to="*.xml" />
- </copy>
- <copy todir="${basedir}/target/templates-site">
- <fileset dir="${basedir}/../torque-templates/target/site">
- <include name="*.html" />
- </fileset>
- <mapper type="glob" from="*.html" to="*.xml" />
- </copy>
- <copy todir="${basedir}/target/maven-plugin-site">
- <fileset dir="${basedir}/../torque-maven-plugin/target/site">
- <include name="*.html" />
- </fileset>
- <mapper type="glob" from="*.html" to="*.xml" />
- </copy>
- <copy todir="${basedir}/target/ant-tasks-site">
- <fileset dir="${basedir}/../torque-ant-tasks/target/site">
- <include name="*.html" />
- </fileset>
- <mapper type="glob" from="*.html" to="*.xml" />
- </copy>
- <!-- replace doctype headers because these cannot be resolved -->
- <replace dir="${basedir}/target/runtime-site">
- <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
- </replace>
- <replace dir="${basedir}/target/generator-site">
- <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
- </replace>
- <replace dir="${basedir}/target/templates-site">
- <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
- </replace>
- <replace dir="${basedir}/target/maven-plugin-site">
- <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
- </replace>
- <replace dir="${basedir}/target/ant-tasks-site">
- <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
- </replace>
- <!-- replace nbsp in reports -->
- <replace dir="${basedir}/target/runtime-site" includes="*.xml">
- <replacetoken><![CDATA[ ]]></replacetoken>
- <replacevalue> </replacevalue>
- </replace>
- <replace dir="${basedir}/target/generator-site" includes="*.xml">
- <replacetoken><![CDATA[ ]]></replacetoken>
- <replacevalue> </replacevalue>
- </replace>
- <replace dir="${basedir}/target/templates-site" includes="*.xml">
- <replacetoken><![CDATA[ ]]></replacetoken>
- <replacevalue> </replacevalue>
- </replace>
- <replace dir="${basedir}/target/maven-plugin-site" includes="*.xml">
- <replacetoken><![CDATA[ ]]></replacetoken>
- <replacevalue> </replacevalue>
- </replace>
- <replace dir="${basedir}/target/ant-tasks-site" includes="*.xml">
- <replacetoken><![CDATA[ ]]></replacetoken>
- <replacevalue> </replacevalue>
- </replace>
- </tasks>
+ <target>
+ <ant antfile="src/ant/build.xml" target="process-other-sites"/>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -176,166 +105,9 @@
<id>merge-content</id>
<phase>post-site</phase>
<configuration>
- <tasks>
- <!-- runtime reports -->
- <loadfile property="runtime.dependencies" srcFile="${basedir}/target/runtime-site-content/dependencies.xml" />
- <replace value="${runtime.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/dependencies.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="runtime.jdepend" srcFile="${basedir}/target/runtime-site-content/jdepend-report.xml" />
- <replace value="${runtime.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/jdepend-report.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="runtime.taglist" srcFile="${basedir}/target/runtime-site-content/taglist.xml" />
- <replace value="${runtime.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/taglist.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
-
- <!-- generator reports -->
- <loadfile property="generator.dependencies" srcFile="${basedir}/target/generator-site-content/dependencies.xml" />
- <replace value="${generator.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/generator/dependencies.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="generator.jdepend" srcFile="${basedir}/target/generator-site-content/jdepend-report.xml" />
- <replace value="${generator.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/jdepend-report.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="generator.taglist" srcFile="${basedir}/target/generator-site-content/taglist.xml" />
- <replace value="${generator.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/taglist.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
-
- <!-- templates reports -->
- <loadfile property="templates.dependencies" srcFile="${basedir}/target/templates-site-content/dependencies.xml" />
- <replace value="${templates.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/templates/dependencies.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="templates.jdepend" srcFile="${basedir}/target/templates-site-content/jdepend-report.xml" />
- <replace value="${templates.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/jdepend-report.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="templates.taglist" srcFile="${basedir}/target/templates-site-content/taglist.xml" />
- <replace value="${templates.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/taglist.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
-
- <!-- maven 2 plugin reports -->
- <loadfile property="maven-plugin.dependencies" srcFile="${basedir}/target/maven-plugin-site-content/dependencies.xml" />
- <replace value="${maven-plugin.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/dependencies.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="maven-plugin.jdepend" srcFile="${basedir}/target/maven-plugin-site-content/jdepend-report.xml" />
- <replace value="${maven-plugin.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/jdepend-report.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="maven-plugin.taglist" srcFile="${basedir}/target/maven-plugin-site-content/taglist.xml" />
- <replace value="${maven-plugin.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/taglist.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="maven-plugin.generate-goal" srcFile="${basedir}/target/maven-plugin-site-content/generate-mojo.xml" />
- <replace value="${maven-plugin.generate-goal}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reference/generate-goal.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
-
- <!-- ant tasks reports -->
- <loadfile property="ant-tasks.dependencies" srcFile="${basedir}/target/ant-tasks-site-content/dependencies.xml" />
- <replace value="${ant-tasks.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/dependencies.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="ant-tasks.jdepend" srcFile="${basedir}/target/ant-tasks-site-content/jdepend-report.xml" />
- <replace value="${ant-tasks.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/jdepend-report.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
- <loadfile property="ant-tasks.taglist" srcFile="${basedir}/target/ant-tasks-site-content/taglist.xml" />
- <replace value="${ant-tasks.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/taglist.html">
- <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
- </replace>
-
- <!-- runtime extra report pages -->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/apidocs">
- <fileset dir="${basedir}/../torque-runtime/target/site/apidocs" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/testapidocs">
- <fileset dir="${basedir}/../torque-runtime/target/site/testapidocs" />
- </copy>
-
- <!-- generator extra report pages-->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/apidocs">
- <fileset dir="${basedir}/../torque-generator/target/site/apidocs" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/testapidocs">
- <fileset dir="${basedir}/../torque-generator/target/site/testapidocs" />
- </copy>
-
- <!-- templates extra report pages -->
- <copy todir="${project.reporting.outputDirectory}/documentation/orm-reference">
- <fileset dir="${basedir}/../torque-templates/target/site">
- <include name="*.xsd" />
- </fileset>
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/reports/apidocs">
- <fileset dir="${basedir}/../torque-templates/target/site/apidocs" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/reports/testapidocs">
- <fileset dir="${basedir}/../torque-templates/target/site/testapidocs" />
- </copy>
-
- <!-- maven plugin extra report pages -->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/apidocs">
- <fileset dir="${basedir}/../torque-maven-plugin/target/site/apidocs" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/testapidocs">
- <fileset dir="${basedir}/../torque-maven-plugin/target/site/testapidocs" />
- </copy>
-
- <!-- ant tasks extra report pages -->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/apidocs">
- <fileset dir="${basedir}/../torque-ant-tasks/target/site/apidocs" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/testapidocs">
- <fileset dir="${basedir}/../torque-ant-tasks/target/site/testapidocs" />
- </copy>
-
- <!-- runtime images -->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/images">
- <fileset dir="${basedir}/../torque-runtime/target/site/images" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/images">
- <fileset dir="${basedir}/../torque-runtime/target/site/images" />
- </copy>
-
- <!-- generator images-->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/images">
- <fileset dir="${basedir}/../torque-generator/target/site/images" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/images">
- <fileset dir="${basedir}/../torque-generator/target/site/images" />
- </copy>
-
- <!-- templates images -->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/images">
- <fileset dir="${basedir}/../torque-templates/target/site/images" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/reports/images">
- <fileset dir="${basedir}/../torque-templates/target/site/images" />
- </copy>
-
- <!-- maven plugin images -->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/images">
- <fileset dir="${basedir}/../torque-maven-plugin/target/site/images" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/images">
- <fileset dir="${basedir}/../torque-maven-plugin/target/site/images" />
- </copy>
-
- <!-- ant tasks images -->
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/images">
- <fileset dir="${basedir}/../torque-ant-tasks/target/site/images" />
- </copy>
- <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/images">
- <fileset dir="${basedir}/../torque-ant-tasks/target/site/images" />
- </copy>
- </tasks>
+ <target>
+ <ant antfile="src/ant/build.xml" target="merge-content"/>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -405,4 +177,112 @@
</extensions>
</build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <properties>
+ <torque.test.profileDirectory>derbyEmbedded</torque.test.profileDirectory>
+ <torque.test.idmethod>native</torque.test.idmethod>
+ <torque.test.driver.artifactId>derby</torque.test.driver.artifactId>
+ <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId>
+ <torque.test.driver.version>10.8.2.2</torque.test.driver.version>
+ <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
+ <torque.targetDatabase>derby</torque.targetDatabase>
+ <torque.database.url>jdbc:derby:torque-test/target/bookstore;create=true</torque.database.url>
+ <torque.database.user />
+ <torque.database.password />
+ <torque.database.shutdown.url>jdbc:derby:torque-test/target/bookstore;shutdown=true</torque.database.shutdown.url>
+ <torque.database.shutdown.skip>false</torque.database.shutdown.skip>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>transform-other-sites-for-package</id>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>target/runtime-site</dir>
+ <stylesheet>src/site/xslt/body-content.xsl</stylesheet>
+ <outputDir>target/runtime-site-content</outputDir>
+ </transformationSet>
+ <transformationSet>
+ <dir>target/generator-site</dir>
+ <stylesheet>src/site/xslt/body-content.xsl</stylesheet>
+ <outputDir>target/generator-site-content</outputDir>
+ </transformationSet>
+ <transformationSet>
+ <dir>target/templates-site</dir>
+ <stylesheet>src/site/xslt/body-content.xsl</stylesheet>
+ <outputDir>target/templates-site-content</outputDir>
+ </transformationSet>
+ <transformationSet>
+ <dir>target/maven-plugin-site</dir>
+ <stylesheet>src/site/xslt/body-content.xsl</stylesheet>
+ <outputDir>target/maven-plugin-site-content</outputDir>
+ </transformationSet>
+ <transformationSet>
+ <dir>target/ant-tasks-site</dir>
+ <stylesheet>src/site/xslt/body-content.xsl</stylesheet>
+ <outputDir>target/ant-tasks-site-content</outputDir>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-other-sites-for-package</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <target>
+ <ant antfile="src/ant/build.xml" target="process-other-sites"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>merge-content-for-package</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <ant antfile="src/ant/build.xml" target="merge-content"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jar-site-for-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Added: db/torque/torque4/trunk/torque-site/src/ant/build.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/ant/build.xml?rev=1415983&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/ant/build.xml (added)
+++ db/torque/torque4/trunk/torque-site/src/ant/build.xml Sat Dec 1 11:49:34 2012
@@ -0,0 +1,227 @@
+<project name="torque-site">
+
+ <target name="process-other-sites">
+ <mkdir dir="${basedir}/target/runtime-site" />
+ <mkdir dir="${basedir}/target/generator-site" />
+ <mkdir dir="${basedir}/target/templates-site" />
+ <mkdir dir="${basedir}/target/maven-plugin-site" />
+ <mkdir dir="${basedir}/target/ant-tasks-site" />
+ <copy todir="${basedir}/target/runtime-site">
+ <fileset dir="${basedir}/../torque-runtime/target/site">
+ <include name="*.html" />
+ </fileset>
+ <mapper type="glob" from="*.html" to="*.xml" />
+ </copy>
+ <copy todir="${basedir}/target/generator-site">
+ <fileset dir="${basedir}/../torque-generator/target/site">
+ <include name="*.html" />
+ </fileset>
+ <mapper type="glob" from="*.html" to="*.xml" />
+ </copy>
+ <copy todir="${basedir}/target/templates-site">
+ <fileset dir="${basedir}/../torque-templates/target/site">
+ <include name="*.html" />
+ </fileset>
+ <mapper type="glob" from="*.html" to="*.xml" />
+ </copy>
+ <copy todir="${basedir}/target/maven-plugin-site">
+ <fileset dir="${basedir}/../torque-maven-plugin/target/site">
+ <include name="*.html" />
+ </fileset>
+ <mapper type="glob" from="*.html" to="*.xml" />
+ </copy>
+ <copy todir="${basedir}/target/ant-tasks-site">
+ <fileset dir="${basedir}/../torque-ant-tasks/target/site">
+ <include name="*.html" />
+ </fileset>
+ <mapper type="glob" from="*.html" to="*.xml" />
+ </copy>
+ <!-- replace doctype headers because these cannot be resolved -->
+ <replace dir="${basedir}/target/runtime-site">
+ <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
+ </replace>
+ <replace dir="${basedir}/target/generator-site">
+ <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
+ </replace>
+ <replace dir="${basedir}/target/templates-site">
+ <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
+ </replace>
+ <replace dir="${basedir}/target/maven-plugin-site">
+ <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
+ </replace>
+ <replace dir="${basedir}/target/ant-tasks-site">
+ <replacetoken><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></replacetoken>
+ </replace>
+ <!-- replace nbsp in reports -->
+ <replace dir="${basedir}/target/runtime-site" includes="*.xml">
+ <replacetoken><![CDATA[ ]]></replacetoken>
+ <replacevalue> </replacevalue>
+ </replace>
+ <replace dir="${basedir}/target/generator-site" includes="*.xml">
+ <replacetoken><![CDATA[ ]]></replacetoken>
+ <replacevalue> </replacevalue>
+ </replace>
+ <replace dir="${basedir}/target/templates-site" includes="*.xml">
+ <replacetoken><![CDATA[ ]]></replacetoken>
+ <replacevalue> </replacevalue>
+ </replace>
+ <replace dir="${basedir}/target/maven-plugin-site" includes="*.xml">
+ <replacetoken><![CDATA[ ]]></replacetoken>
+ <replacevalue> </replacevalue>
+ </replace>
+ <replace dir="${basedir}/target/ant-tasks-site" includes="*.xml">
+ <replacetoken><![CDATA[ ]]></replacetoken>
+ <replacevalue> </replacevalue>
+ </replace>
+ </target>
+
+ <target name="merge-content">
+ <!-- runtime reports -->
+ <loadfile property="runtime.dependencies" srcFile="${basedir}/target/runtime-site-content/dependencies.xml" />
+ <replace value="${runtime.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/dependencies.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="runtime.jdepend" srcFile="${basedir}/target/runtime-site-content/jdepend-report.xml" />
+ <replace value="${runtime.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/jdepend-report.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="runtime.taglist" srcFile="${basedir}/target/runtime-site-content/taglist.xml" />
+ <replace value="${runtime.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/taglist.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <!-- generator reports -->
+ <loadfile property="generator.dependencies" srcFile="${basedir}/target/generator-site-content/dependencies.xml" />
+ <replace value="${generator.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/generator/dependencies.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="generator.jdepend" srcFile="${basedir}/target/generator-site-content/jdepend-report.xml" />
+ <replace value="${generator.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/jdepend-report.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="generator.taglist" srcFile="${basedir}/target/generator-site-content/taglist.xml" />
+ <replace value="${generator.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/taglist.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <!-- templates reports -->
+ <loadfile property="templates.dependencies" srcFile="${basedir}/target/templates-site-content/dependencies.xml" />
+ <replace value="${templates.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/templates/dependencies.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="templates.jdepend" srcFile="${basedir}/target/templates-site-content/jdepend-report.xml" />
+ <replace value="${templates.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/jdepend-report.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="templates.taglist" srcFile="${basedir}/target/templates-site-content/taglist.xml" />
+ <replace value="${templates.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/taglist.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <!-- maven 2 plugin reports -->
+ <loadfile property="maven-plugin.dependencies" srcFile="${basedir}/target/maven-plugin-site-content/dependencies.xml" />
+ <replace value="${maven-plugin.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/dependencies.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="maven-plugin.jdepend" srcFile="${basedir}/target/maven-plugin-site-content/jdepend-report.xml" />
+ <replace value="${maven-plugin.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/jdepend-report.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="maven-plugin.taglist" srcFile="${basedir}/target/maven-plugin-site-content/taglist.xml" />
+ <replace value="${maven-plugin.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/taglist.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="maven-plugin.generate-goal" srcFile="${basedir}/target/maven-plugin-site-content/generate-mojo.xml" />
+ <replace value="${maven-plugin.generate-goal}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reference/generate-goal.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <!-- ant tasks reports -->
+ <loadfile property="ant-tasks.dependencies" srcFile="${basedir}/target/ant-tasks-site-content/dependencies.xml" />
+ <replace value="${ant-tasks.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/dependencies.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="ant-tasks.jdepend" srcFile="${basedir}/target/ant-tasks-site-content/jdepend-report.xml" />
+ <replace value="${ant-tasks.jdepend}" file="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/jdepend-report.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <loadfile property="ant-tasks.taglist" srcFile="${basedir}/target/ant-tasks-site-content/taglist.xml" />
+ <replace value="${ant-tasks.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/taglist.html">
+ <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+ </replace>
+ <!-- runtime extra report pages -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/apidocs">
+ <fileset dir="${basedir}/../torque-runtime/target/site/apidocs" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/testapidocs">
+ <fileset dir="${basedir}/../torque-runtime/target/site/testapidocs" />
+ </copy>
+ <!-- generator extra report pages-->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/apidocs">
+ <fileset dir="${basedir}/../torque-generator/target/site/apidocs" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/testapidocs">
+ <fileset dir="${basedir}/../torque-generator/target/site/testapidocs" />
+ </copy>
+ <!-- templates extra report pages -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/orm-reference">
+ <fileset dir="${basedir}/../torque-templates/target/site">
+ <include name="*.xsd" />
+ </fileset>
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/reports/apidocs">
+ <fileset dir="${basedir}/../torque-templates/target/site/apidocs" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/reports/testapidocs">
+ <fileset dir="${basedir}/../torque-templates/target/site/testapidocs" />
+ </copy>
+ <!-- maven plugin extra report pages -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/apidocs">
+ <fileset dir="${basedir}/../torque-maven-plugin/target/site/apidocs" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/testapidocs">
+ <fileset dir="${basedir}/../torque-maven-plugin/target/site/testapidocs" />
+ </copy>
+ <!-- ant tasks extra report pages -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/apidocs">
+ <fileset dir="${basedir}/../torque-ant-tasks/target/site/apidocs" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/testapidocs">
+ <fileset dir="${basedir}/../torque-ant-tasks/target/site/testapidocs" />
+ </copy>
+
+ <!-- runtime images -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/images">
+ <fileset dir="${basedir}/../torque-runtime/target/site/images" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/images">
+ <fileset dir="${basedir}/../torque-runtime/target/site/images" />
+ </copy>
+ <!-- generator images-->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/images">
+ <fileset dir="${basedir}/../torque-generator/target/site/images" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/images">
+ <fileset dir="${basedir}/../torque-generator/target/site/images" />
+ </copy>
+ <!-- templates images -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/images">
+ <fileset dir="${basedir}/../torque-templates/target/site/images" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/reports/images">
+ <fileset dir="${basedir}/../torque-templates/target/site/images" />
+ </copy>
+ <!-- maven plugin images -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/images">
+ <fileset dir="${basedir}/../torque-maven-plugin/target/site/images" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/images">
+ <fileset dir="${basedir}/../torque-maven-plugin/target/site/images" />
+ </copy>
+ <!-- ant tasks images -->
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/images">
+ <fileset dir="${basedir}/../torque-ant-tasks/target/site/images" />
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/images">
+ <fileset dir="${basedir}/../torque-ant-tasks/target/site/images" />
+ </copy>
+ </target>
+
+</project>
+
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org