Author: cbrisson
Date: Mon Jun 25 18:46:53 2018
New Revision: 1834366
URL: http://svn.apache.org/viewvc?rev=1834366&view=rev
Log:
[site/prod] push last changes into prod (mainly tools/devel dependencies page
and automatic code colorization)
Modified:
velocity/site/production/README
velocity/site/production/css/site.css
velocity/site/production/engine/1.7/developer-guide.html
velocity/site/production/engine/1.7/user-guide.html
velocity/site/production/engine/1.7/vtl-reference.html
velocity/site/production/engine/1.7/webapps.html
velocity/site/production/engine/2.0/developer-guide.html
velocity/site/production/engine/2.0/user-guide.html
velocity/site/production/engine/2.0/vtl-reference.html
velocity/site/production/engine/2.0/webapps.html
velocity/site/production/engine/devel/developer-guide.html
velocity/site/production/engine/devel/user-guide.html
velocity/site/production/engine/devel/vtl-reference.html
velocity/site/production/engine/devel/webapps.html
velocity/site/production/tools/2.0/creating-tools.html
velocity/site/production/tools/2.0/standalone.html
velocity/site/production/tools/2.0/struts-user-guide.html
velocity/site/production/tools/2.0/view-layoutservlet.html
velocity/site/production/tools/devel/dependencies.html
Modified: velocity/site/production/README
URL:
http://svn.apache.org/viewvc/velocity/site/production/README?rev=1834366&r1=1834365&r2=1834366&view=diff
==============================================================================
--- velocity/site/production/README (original)
+++ velocity/site/production/README Mon Jun 25 18:46:53 2018
@@ -15,6 +15,8 @@ BUILDING
To build the site locally, you need a local checkout of
https://svn.apache.org/repos/infra/websites/cms (then refer to the STATUS file).
You'll of course also need a local checkout of the site sources,
https://svn.apache.org/repos/asf/velocity/site (the sources for the cms are in
/cms/, but the process needs the whole site).
+Note: the markdown tables extension, in the python-markdown package (python
2.7), seems broken at version 2.6.9 ; I had to revert the markdown package to
2.6.7.
+
BREADCRUMBS
-----------
Modified: velocity/site/production/css/site.css
URL:
http://svn.apache.org/viewvc/velocity/site/production/css/site.css?rev=1834366&r1=1834365&r2=1834366&view=diff
==============================================================================
--- velocity/site/production/css/site.css (original)
+++ velocity/site/production/css/site.css Mon Jun 25 18:46:53 2018
@@ -465,3 +465,76 @@ table.conversions th
margin-bottom: 1.2em;
}
}
+
+/* markdown code hilite */
+/* generated with command: pygmentize -S default -f html -a .codehilite */
+
+.codehilite .hll { background-color: #ffffcc }
+.codehilite { background: #f8f8f8; }
+.codehilite .c { color: #408080; font-style: italic } /* Comment */
+.codehilite .err { border: 1px solid #FF0000 } /* Error */
+.codehilite .k { color: #008000; font-weight: bold } /* Keyword */
+.codehilite .o { color: #666666 } /* Operator */
+.codehilite .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
+.codehilite .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+.codehilite .cp { color: #BC7A00 } /* Comment.Preproc */
+.codehilite .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile
*/
+.codehilite .c1 { color: #408080; font-style: italic } /* Comment.Single */
+.codehilite .cs { color: #408080; font-style: italic } /* Comment.Special */
+.codehilite .gd { color: #A00000 } /* Generic.Deleted */
+.codehilite .ge { font-style: italic } /* Generic.Emph */
+.codehilite .gr { color: #FF0000 } /* Generic.Error */
+.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.codehilite .gi { color: #00A000 } /* Generic.Inserted */
+.codehilite .go { color: #888888 } /* Generic.Output */
+.codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.codehilite .gs { font-weight: bold } /* Generic.Strong */
+.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.codehilite .gt { color: #0044DD } /* Generic.Traceback */
+.codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+.codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+.codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+.codehilite .kp { color: #008000 } /* Keyword.Pseudo */
+.codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+.codehilite .kt { color: #B00040 } /* Keyword.Type */
+.codehilite .m { color: #666666 } /* Literal.Number */
+.codehilite .s { color: #BA2121 } /* Literal.String */
+.codehilite .na { color: #7D9029 } /* Name.Attribute */
+.codehilite .nb { color: #008000 } /* Name.Builtin */
+.codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.codehilite .no { color: #880000 } /* Name.Constant */
+.codehilite .nd { color: #AA22FF } /* Name.Decorator */
+.codehilite .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.codehilite .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.codehilite .nf { color: #0000FF } /* Name.Function */
+.codehilite .nl { color: #A0A000 } /* Name.Label */
+.codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.codehilite .nv { color: #19177C } /* Name.Variable */
+.codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.codehilite .w { color: #bbbbbb } /* Text.Whitespace */
+.codehilite .mb { color: #666666 } /* Literal.Number.Bin */
+.codehilite .mf { color: #666666 } /* Literal.Number.Float */
+.codehilite .mh { color: #666666 } /* Literal.Number.Hex */
+.codehilite .mi { color: #666666 } /* Literal.Number.Integer */
+.codehilite .mo { color: #666666 } /* Literal.Number.Oct */
+.codehilite .sa { color: #BA2121 } /* Literal.String.Affix */
+.codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */
+.codehilite .sc { color: #BA2121 } /* Literal.String.Char */
+.codehilite .dl { color: #BA2121 } /* Literal.String.Delimiter */
+.codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+.codehilite .s2 { color: #BA2121 } /* Literal.String.Double */
+.codehilite .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape
*/
+.codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */
+.codehilite .si { color: #BB6688; font-weight: bold } /*
Literal.String.Interpol */
+.codehilite .sx { color: #008000 } /* Literal.String.Other */
+.codehilite .sr { color: #BB6688 } /* Literal.String.Regex */
+.codehilite .s1 { color: #BA2121 } /* Literal.String.Single */
+.codehilite .ss { color: #19177C } /* Literal.String.Symbol */
+.codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */
+.codehilite .fm { color: #0000FF } /* Name.Function.Magic */
+.codehilite .vc { color: #19177C } /* Name.Variable.Class */
+.codehilite .vg { color: #19177C } /* Name.Variable.Global */
+.codehilite .vi { color: #19177C } /* Name.Variable.Instance */
+.codehilite .vm { color: #19177C } /* Name.Variable.Magic */
+.codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
Modified: velocity/site/production/engine/1.7/developer-guide.html
URL:
http://svn.apache.org/viewvc/velocity/site/production/engine/1.7/developer-guide.html?rev=1834366&r1=1834365&r2=1834366&view=diff
==============================================================================
--- velocity/site/production/engine/1.7/developer-guide.html (original)
+++ velocity/site/production/engine/1.7/developer-guide.html Mon Jun 25
18:46:53 2018
@@ -533,15 +533,15 @@ template.merge( context2, writer );
<h3 id="objects-created-in-the-template">Objects Created in the Template<a
class="headerlink" href="#objects-created-in-the-template" title="Permanent
link">¶</a></h3>
<p>There are two common situations where the Java code must deal with objects
created at runtime in the template:</p>
<p>When a template author calls a method of an object placed into the context
by Java code.</p>
-<div class="codehilite"><pre><span class="cp">#</span><span
class="nf">set</span><span class="p">($</span><span class="nv">myarr</span>
<span class="o">=</span> <span class="o">[</span><span
class="s2">"a"</span><span class="p">,</span><span
class="s2">"b"</span><span class="p">,</span><span
class="s2">"c"</span><span class="p">]</span> <span
class="p">)</span><span class="x"></span>
-<span class="p">$</span><span class="nv">foo</span><span
class="p">.</span><span class="nv">bar</span><span class="p">(</span> <span
class="p">$</span><span class="nv">myarr</span> <span class="p">)</span><span
class="x"></span>
+<div class="codehilite"><pre>#set($myarr =
["a","b","c"] )
+$foo.bar( $myarr )
</pre></div>
<p>When a template adds objects to the context, the Java code can access those
objects after the merge process is complete.</p>
-<div class="codehilite"><pre><span class="cp">#</span><span
class="nf">set</span><span class="p">($</span><span class="nv">myarr</span>
<span class="o">=</span> <span class="o">[</span><span
class="s2">"a"</span><span class="p">,</span><span
class="s2">"b"</span><span class="p">,</span><span
class="s2">"c"</span><span class="p">]</span> <span
class="p">)</span><span class="x"></span>
-<span class="cp">#</span><span class="nf">set</span><span class="p">(</span>
<span class="p">$</span><span class="nv">foo</span> <span class="o">=</span>
<span class="m">1</span> <span class="p">)</span><span class="x"></span>
-<span class="cp">#</span><span class="nf">set</span><span class="p">(</span>
<span class="p">$</span><span class="nv">bar</span> <span class="o">=</span>
<span class="s2">"bar"</span><span class="p">)</span><span
class="x"></span>
+<div class="codehilite"><pre>#set($myarr =
["a","b","c"] )
+#set( $foo = 1 )
+#set( $bar = "bar")
</pre></div>
@@ -669,7 +669,7 @@ template.merge( context2, writer );
<p>where the template we used, testtemplate.vm, is</p>
-<div class="codehilite"><pre><span class="x">Hi! This </span><span
class="p">$</span><span class="nv">name</span><span class="x"> from the
</span><span class="p">$</span><span class="nv">project</span><span class="x">
project.</span>
+<div class="codehilite"><pre>Hi! This $name from the $project project.
</pre></div>
