svn commit: r988684 - in /websites/staging/sis/trunk/content: ./ epsg.html

[buildbot]

Author: buildbot
Date: Thu May 19 21:14:39 2016
New Revision: 988684

Log:
Staging update by buildbot for sis

Modified:
    websites/staging/sis/trunk/content/   (props changed)
    websites/staging/sis/trunk/content/epsg.html

Propchange: websites/staging/sis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu May 19 21:14:39 2016
@@ -1 +1 @@
-1744639
+1744641

Modified: websites/staging/sis/trunk/content/epsg.html
==============================================================================
--- websites/staging/sis/trunk/content/epsg.html (original)
+++ websites/staging/sis/trunk/content/epsg.html Thu May 19 21:14:39 2016
@@ -195,33 +195,39 @@ When Apache SIS is used in a JavaEE cont
 <li>
 <p>If using Derby, copy <code>derby.war</code> into the 
<code>$CATALINA_HOME/webapps</code> directory and specify the directory where
    the Derby databases are located (skip this step if another database is 
used):</p>
-<p>:::bash
-   export JAVA_OPTS=-Dderby.system.home=$SIS_DATA/Databases</p>
+<div class="codehilite"><pre><span class="nb">export </span><span 
class="nv">JAVA_OPTS</span><span class="o">=</span>-Dderby.system.home<span 
class="o">=</span><span class="nv">$SIS_DATA</span>/Databases
+</pre></div>
+
+
 </li>
 <li>
 <p>Declare the JNDI name in application <code>WEB-INF/web.xml</code> file:</p>
-<p>:::xml
-   <resource-ref>
-     <description>EPSG dataset and other metadata used by Apache 
SIS.</description>
-     <res-ref-name>jdbc/SpatialMetadata</res-ref-name>
-     <res-type>javax.sql.DataSource</res-type>
-     <res-auth>Container</res-auth>
-   </resource-ref></p>
+<div class="codehilite"><pre><span class="nt">&lt;resource-ref&gt;</span>
+  <span class="nt">&lt;description&gt;</span>EPSG dataset and other metadata 
used by Apache SIS.<span class="nt">&lt;/description&gt;</span>
+  <span class="nt">&lt;res-ref-name&gt;</span>jdbc/SpatialMetadata<span 
class="nt">&lt;/res-ref-name&gt;</span>
+  <span class="nt">&lt;res-type&gt;</span>javax.sql.DataSource<span 
class="nt">&lt;/res-type&gt;</span>
+  <span class="nt">&lt;res-auth&gt;</span>Container<span 
class="nt">&lt;/res-auth&gt;</span>
+<span class="nt">&lt;/resource-ref&gt;</span>
+</pre></div>
+
+
 </li>
 <li>
 <p>Configure the data source in <code>$CATALINA_HOME/conf/context.xml</code> 
or in application <code>META-INF/context.xml</code> file
    (change attribute values as needed for the chosen JDBC driver):</p>
-<p>:::xml
-   <Context crossContext="true">
-     <WatchedResource>WEB-INF/web.xml</WatchedResource>
-     <Resource name            = "jdbc/SpatialMetadata"
-               auth            = "Container"
-               type            = "javax.sql.DataSource"
-               username        = "sa"
-               password        = "sa"
-               driverClassName = "org.apache.derby.jdbc.EmbeddedDriver"
-               url             = "jdbc:derby:SpatialMetadata"/>
-   </Context></p>
+<div class="codehilite"><pre><span class="nt">&lt;Context</span> <span 
class="na">crossContext=</span><span class="s">&quot;true&quot;</span><span 
class="nt">&gt;</span>
+  <span class="nt">&lt;WatchedResource&gt;</span>WEB-INF/web.xml<span 
class="nt">&lt;/WatchedResource&gt;</span>
+  <span class="nt">&lt;Resource</span> <span class="na">name            
=</span> <span class="s">&quot;jdbc/SpatialMetadata&quot;</span>
+            <span class="na">auth            =</span> <span 
class="s">&quot;Container&quot;</span>
+            <span class="na">type            =</span> <span 
class="s">&quot;javax.sql.DataSource&quot;</span>
+            <span class="na">username        =</span> <span 
class="s">&quot;sa&quot;</span>
+            <span class="na">password        =</span> <span 
class="s">&quot;sa&quot;</span>
+            <span class="na">driverClassName =</span> <span 
class="s">&quot;org.apache.derby.jdbc.EmbeddedDriver&quot;</span>
+            <span class="na">url             =</span> <span 
class="s">&quot;jdbc:derby:SpatialMetadata&quot;</span><span 
class="nt">/&gt;</span>
+<span class="nt">&lt;/Context&gt;</span>
+</pre></div>
+
+
 </li>
 <li>
 <p>If using Derby, verify on the <code>localhost:8080/derby/derbynet</code> 
page (skip this step if another database is used).</p>