You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by he...@apache.org on 2007/01/28 20:08:27 UTC
svn commit: r500857 - in /velocity/engine/branches/Velocity_1.5_BRANCH: ./
build/ src/site/ xdocs/ xdocs/docs/ xdocs/docs/translations/
xdocs/translations/
Author: henning
Date: Sun Jan 28 11:08:25 2007
New Revision: 500857
URL: http://svn.apache.org/viewvc?view=rev&rev=500857
Log:
Shuffle docs a bit around so the maven build for the site and the ant build for the distribution don't interfere with each other.
Added:
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/build.xml
- copied unchanged from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/build.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/committers.xml
- copied unchanged from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/committers.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml
- copied, changed from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/getting-started.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml
- copied, changed from r500836, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/index.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/jar-dependencies.xml
- copied unchanged from r500834, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/jar-dependencies.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml
- copied, changed from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/overview.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/translations/
- copied from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/translations/
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/webapps.xml
- copied unchanged from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/webapps.xml
Removed:
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/build.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/committers.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/getting-started.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/index.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/jar-dependencies.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/overview.xml
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/translations/
velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/webapps.xml
Modified:
velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml
velocity/engine/branches/Velocity_1.5_BRANCH/pom.xml
velocity/engine/branches/Velocity_1.5_BRANCH/src/site/site.xml
Modified: velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml?view=diff&rev=500857&r1=500856&r2=500857
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml Sun Jan 28 11:08:25 2007
@@ -779,10 +779,9 @@
#######################################################
</echo>
- <anakia basedir="${xdocs.dir}" destdir="${build.docs}"
+ <anakia basedir="${xdocs.dir}/docs" destdir="${build.docs}"
extension=".html" style="site.vsl"
- projectFile="stylesheets/${docs.project}"
- excludes="**/stylesheets/** empty.xml"
+ projectFile="../stylesheets/${docs.project}"
includes="**/*.xml"
lastModifiedCheck="true"
templatePath="${xdocs.dir}/stylesheets">
Modified: velocity/engine/branches/Velocity_1.5_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/pom.xml?view=diff&rev=500857&r1=500856&r2=500857
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/pom.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/pom.xml Sun Jan 28 11:08:25 2007
@@ -51,6 +51,7 @@
<configuration>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
+ <xdocDirectory>${basedir}/xdocs/docs</xdocDirectory>
</configuration>
</plugin>
</plugins>
Modified: velocity/engine/branches/Velocity_1.5_BRANCH/src/site/site.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/src/site/site.xml?view=diff&rev=500857&r1=500856&r2=500857
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/src/site/site.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/src/site/site.xml Sun Jan 28 11:08:25 2007
@@ -50,12 +50,12 @@
</menu>
<menu name="Docs">
- <item name="User Guide" href="docs/user-guide.html"/>
- <item name="Developer Guide" href="docs/developer-guide.html"/>
- <item name="VTL Reference" href="docs/vtl-reference-guide.html"/>
- <item name="Anakia: XML->doc tool" href="docs/anakia.html"/>
- <item name="Texen: text generation" href="docs/texen.html"/>
- <item name="Veltag: JSP taglib" href="docs/veltag.html"/>
+ <item name="User Guide" href="user-guide.html"/>
+ <item name="Developer Guide" href="developer-guide.html"/>
+ <item name="VTL Reference" href="vtl-reference-guide.html"/>
+ <item name="Anakia: XML->doc tool" href="anakia.html"/>
+ <item name="Texen: text generation" href="texen.html"/>
+ <item name="Veltag: JSP taglib" href="veltag.html"/>
</menu>
<menu name="Developers">
Copied: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml (from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/getting-started.xml)
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml?view=diff&rev=500857&p1=velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/getting-started.xml&r1=500648&p2=velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml&r2=500857
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/getting-started.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml Sun Jan 28 11:08:25 2007
@@ -40,13 +40,13 @@
<ul>
- <li><a href="docs/user-guide.html">User's Guide</a> - explains how to write Velocity templates
+ <li><a href="user-guide.html">User's Guide</a> - explains how to write Velocity templates
</li>
- <li><a href="docs/developer-guide.html">Developer's Guide</a> - explains how to use Velocity inside Java programs
+ <li><a href="developer-guide.html">Developer's Guide</a> - explains how to use Velocity inside Java programs
</li>
- <li><a href="docs/vtl-reference-guide.html">VTL Reference</a> - concise syntax for Velocity Template Language (VTL)
+ <li><a href="vtl-reference-guide.html">VTL Reference</a> - concise syntax for Velocity Template Language (VTL)
</li>
<li><a href="webapps.html">Web Application Guide</a> - web-based application techniques and
Copied: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml (from r500836, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/index.xml)
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml?view=diff&rev=500857&p1=velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/index.xml&r1=500836&p2=velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml&r2=500857
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/index.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml Sun Jan 28 11:08:25 2007
@@ -43,7 +43,7 @@
<p> Velocity's capabilities reach well beyond the realm of the web; for example, it can
be used to generate SQL, PostScript and XML (see
- <a href="docs/anakia.html">Anakia</a> for more information on XML
+ <a href="anakia.html">Anakia</a> for more information on XML
transformations) from templates. It can be used either as a standalone utility for
generating source code and reports, or as an integrated component of other systems.
For instance, Velocity provides template services for the
Copied: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml (from r500648, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/overview.xml)
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml?view=diff&rev=500857&p1=velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/overview.xml&r1=500648&p2=velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml&r2=500857
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/overview.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml Sun Jan 28 11:08:25 2007
@@ -54,7 +54,7 @@
file rather than directly embedded in your Java code.
</li>
- <li>XML transformation. Velocity provides an ant task called <a href="docs/anakia.html">Anakia</a> which reads
+ <li>XML transformation. Velocity provides an ant task called <a href="anakia.html">Anakia</a> which reads
an XML file and makes it available to a Velocity template. A common application is to
convert documentation stored in a generic "xdoc" format into a styled HTML document.
</li>