geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1030161 [8/12] - in /websites/production/geronimo/content: GMOxDOC12/ GMOxDOC12/administering-security-realms.data/ GMOxDOC12/administering-the-apache-geronimo-server.data/ GMOxDOC12/configuring-the-jms-server.data/ GMOxDOC12/create-a-data...
Date Mon, 21 May 2018 13:00:10 GMT
Modified: websites/production/geronimo/content/GMOxDOC22/jms-clustering-in-geronimo.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/jms-clustering-in-geronimo.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/jms-clustering-in-geronimo.html Mon May 21 13:00:07 2018
@@ -105,11 +105,11 @@
 
 <p>There are different kinds of Master/Slave configurations available according to ActiveMQ documentation:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343397655 {padding: 0px;}
-div.rbtoc1523343397655 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343397655 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907325569 {padding: 0px;}
+div.rbtoc1526907325569 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907325569 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343397655">
+/*]]>*/</style><div class="toc-macro rbtoc1526907325569">
 <ul class="toc-indentation"><li><a shape="rect" href="#JMSclusteringinGeronimo-PureMaster/Slave">Pure Master/Slave</a></li><li><a shape="rect" href="#JMSclusteringinGeronimo-SharedFilesystem">Shared File system</a></li><li><a shape="rect" href="#JMSclusteringinGeronimo-JDBCMasterSlave">JDBC Master Slave</a></li></ul>
 </div>
 
@@ -120,7 +120,7 @@ div.rbtoc1523343397655 li {margin-left:
 <h2 id="JMSclusteringinGeronimo-Masternode">Master node</h2>
 <p>On the master node, you just need to specify the current node is a master by using <em>brokerName</em> attribute as followed.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>activemq.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
 &lt;broker xmlns="http://activemq.apache.org/schema/core" 
         brokerName="master" 
@@ -134,7 +134,7 @@ div.rbtoc1523343397655 li {margin-left:
 <h2 id="JMSclusteringinGeronimo-Slavenode">Slave node</h2>
 <p>Because each master only has one slave in Pure Master/Slave scenario, the slave node must know URI of master node and also be tagged as a slave node using <em>brokerName</em> attribute.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>activemq.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
  &lt;broker xmlns="http://activemq.apache.org/schema/core" 
          brokerName="slave" deleteAllMessagesOnStartup="true"
@@ -157,7 +157,7 @@ div.rbtoc1523343397655 li {margin-left:
 <h2 id="JMSclusteringinGeronimo-Eachnode">Each node</h2>
 <p>On each node, configure a shared directory as the place where brokers are using <code>persistenceAdapter</code> element as followed:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>activemq.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
    &lt;persistenceAdapter&gt;
       &lt;amqPersistenceAdapter directory="/sharedFileSystem/sharedBrokerData"/&gt;
@@ -180,7 +180,7 @@ div.rbtoc1523343397655 li {margin-left:
 <h2 id="JMSclusteringinGeronimo-Eachnode.1">Each node</h2>
 <p>On each node, configure a shared database pool using <code>jdbcPersistenceAdapter</code> element as followed, we use embeded Derby database server as an example:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>activemq.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
     &lt;persistenceAdapter&gt;
       &lt;amqPersistenceAdapter dataSource="Shared-DS"/&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/jms-resources-deployment-with-deploy-tool.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/jms-resources-deployment-with-deploy-tool.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/jms-resources-deployment-with-deploy-tool.html Mon May 21 13:00:07 2018
@@ -102,7 +102,7 @@
 <p>You can deploy JMS resources with <code>deploy</code> command (without Web console). When you want to create a group of resources consisting of ConnectionFactory, topics and queues you only have to deploy a geronimo-activemq-ra connector (RA means "ResourceAdapter") with an deploy plan like this...</p>
 
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"&gt;
   &lt;dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
     &lt;dep:moduleId&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/jms-resources-deployment.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/jms-resources-deployment.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/jms-resources-deployment.html Mon May 21 13:00:07 2018
@@ -102,7 +102,7 @@
 <p>You can deploy jms resources with the deploy command (without web console). When you want to create a group of resources consisting of ConnectionFactory, topics and queues, you only have to deploy a geronimo-activemq-ra connector (RA meaning "ResourceAdapter") with an deploy plan like this:</p>
 
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"&gt;
   &lt;dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
     &lt;dep:moduleId&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/ldap-realm.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/ldap-realm.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/ldap-realm.html Mon May 21 13:00:07 2018
@@ -105,11 +105,11 @@
 <p>This document is organized in the following sections:</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343362377 {padding: 0px;}
-div.rbtoc1523343362377 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343362377 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907295387 {padding: 0px;}
+div.rbtoc1526907295387 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907295387 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343362377">
+/*]]>*/</style><div class="toc-macro rbtoc1526907295387">
 <ul class="toc-indentation"><li><a shape="rect" href="#LDAPRealm-InstallingApacheDSplugin(optional)">Installing ApacheDS plugin (optional)</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#LDAPRealm-InstallthepluginfromtheGeronimoAdministrationConsole">Install the plugin from the Geronimo Administration Console</a></li><li><a shape="rect" href="#LDAPRealm-Installthepluginfromthecommandline">Install the plugin from the command line</a></li></ul>
 </li><li><a shape="rect" href="#LDAPRealm-DeployingLDAPRealms">Deploying LDAP Realms</a>
@@ -161,7 +161,7 @@ div.rbtoc1523343362377 li {margin-left:
 <p>We mentioned that when using the command line deployer you will need to provide a deployment plan. The purpose of this section is to show you a sample deployment plan, for additional details refer to the <a shape="rect" href="ldap-sample-app-ldap-sample-application.html">ldap-sample-app - LDAP Sample Application</a> section.</p>
 
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Sample LDAP Realm deployment plan</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
     &lt;environment&gt;
         &lt;moduleId&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/locating-your-application-specific-configuration-files.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/locating-your-application-specific-configuration-files.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/locating-your-application-specific-configuration-files.html Mon May 21 13:00:07 2018
@@ -110,13 +110,13 @@
 <h3 id="Locatingyourapplicationspecificconfigurationfiles-DirectuseofServerInfo">Direct use of ServerInfo</h3>
 <p>You can specify a gbean-ref to <strong>ServerInfo</strong> in your geronimo plan:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 SNIPPET NEEDED
 </pre>
 </div></div>
 <p>Look it up in code:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ServerInfo serverInfo = (ServerInfo)new InitialContext.lookup("java:comp/env/ServerInfo");
 File myconfig = serverInfo.resolveServer("var/myApp/myConfig.xml");
 </pre>
@@ -125,7 +125,7 @@ File myconfig = serverInfo.resolveServer
 <h3 id="Locatingyourapplicationspecificconfigurationfiles-Useofgeronimosystemproperties">Use of geronimo system properties</h3>
 <p>The <strong>ServerInfo</strong> gbean sets up two system properties that indicate where the geronimo system and server is located.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 public static final String SERVER_DIR_SYS_PROP = "org.apache.geronimo.server.dir";
 public static final String HOME_DIR_SYS_PROP = "org.apache.geronimo.home.dir";
 </pre>
@@ -134,7 +134,7 @@ public static final String HOME_DIR_SYS_
 <p>Your program can use these to construct the location of your files:</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 String serverDir = System.getProperty(SERVER_DIR_SYS_PROP);
 URI serverUri = URI.create(serverDir);
 URI configFileURI = serverUri.resolve("var/myApp/myConfig.xml");
@@ -146,7 +146,7 @@ File configFile = new File(configFileURI
 <p>You can include a <em>SystemPropertiesGBean</em> in your geronimo plan and set up application specific system properties that can then be used by your program:</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;gbean name="MyAppSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties"&gt;
     &lt;attribute name="systemPathProperties"&gt;
          com.myApp.ConfigFile=var/myApp/myConfig.xml
@@ -159,7 +159,7 @@ File configFile = new File(configFileURI
 </div></div>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 String configFileLocation = System.getProperty("com.myApp.ConfigFile");
 File configFile = new File(configFileLocation);
 </pre>
@@ -169,7 +169,7 @@ File configFile = new File(configFileLoc
 <p>It is also possible to to extend the classloader of your application to include a directory into which you can put your configuration files by including a <em>SharedLib</em> gbean in the geronimo plan for your application:</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;gbean name="MyAppSharedLib" class="org.apache.geronimo.system.sharedlib.SharedLib"&gt;
   &lt;attribute name="classesDirs"&gt;var/myApp&lt;/attribute&gt;
   &lt;reference name="ServerInfo"&gt;
@@ -180,7 +180,7 @@ File configFile = new File(configFileLoc
 </div></div>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ClassLoader cl = Thread.currentThread().getContextClassLoader();
 URL configFileUrl = cl.getResource("myConfig.xml");
 </pre>

Modified: websites/production/geronimo/content/GMOxDOC22/obscuring-passwords.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/obscuring-passwords.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/obscuring-passwords.html Mon May 21 13:00:07 2018
@@ -109,7 +109,7 @@ This prevents someone from verbatim copy
 
 <p>To install this gbean, include the following code in the <strong>rmi-naming</strong> section of <code>var/config/config.xml</code> under <code>&lt;module name="org.apache.geronimo.framework/rmi-naming/&lt;version&gt;/car"&gt;</code>:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;gbean name="org.apache.geronimo.framework/rmi-naming/&lt;version&gt; /car?name=ConfiguredEncryption,j2eeType=GBean 
        gbeanInfo="org.apache.geronimo.system.util.ConfiguredEncryption"&gt;
     &lt;attribute name="path"&gt;var/security/ConfiguredSecretKey.ser&lt;/attribute&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/plugin-based-farming.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/plugin-based-farming.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/plugin-based-farming.html Mon May 21 13:00:07 2018
@@ -173,7 +173,7 @@ ServerHostname=<em>Node_IP</em></p>
 <h4 id="PluginbasedFarming-Deployasampleplugintothefarm">Deploy a sample plugin to the farm</h4>
 <p>Install a plugin to the farm controller with command. For example, use the <a shape="rect" href="geronimo-gshell-commands.html">Gshell command</a> as follows to install a HelloWorld.car plugin:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 deploy/install-plugin D:/HelloWorld.car -s 9.186.10.157
 </pre>
 </div></div>
@@ -185,27 +185,27 @@ deploy/install-plugin D:/HelloWorld.car
 <p>Use the <a shape="rect" href="geronimo-gshell-commands.html">cluster/deploy</a> Gshell command to verify the farm that you set up. For example, add and remove plugins and plugin lists with the following commands:<br clear="none">
 Use this command to add a plugin list p1 to farm cluster1:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">cluster/deploy add -c cluster1 -l p1 -s 9.186.10.157 </pre>
+<pre class="brush: java; gutter: false; theme: Default">cluster/deploy add -c cluster1 -l p1 -s 9.186.10.157 </pre>
 </div></div>
 
 <p>Use this command to add the <code>org.apache.geronimo.samples/HelloWorld/1.0/car</code> plugin to plugin list p1:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">cluster/deploy add -l p1 -a org.apache.geronimo.samples/HelloWorld/1.0/car -s 9.186.10.157</pre>
+<pre class="brush: java; gutter: false; theme: Default">cluster/deploy add -l p1 -a org.apache.geronimo.samples/HelloWorld/1.0/car -s 9.186.10.157</pre>
 </div></div>
 
 <p>Use this command to add the <code>org.apache.geronimo.samples/HelloWorld/1.0/car</code> plugin to plugin list p1 and add p1 to farm cluster1:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">cluster/deploy add -c cluster1 -l p1 -a org.apache.geronimo.samples/HelloWorld/1.0/car -s 9.186.10.157</pre>
+<pre class="brush: java; gutter: false; theme: Default">cluster/deploy add -c cluster1 -l p1 -a org.apache.geronimo.samples/HelloWorld/1.0/car -s 9.186.10.157</pre>
 </div></div>
 
 <p>Use this command to remove a plugin list p1 from farm cluster1:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">cluster/deploy remove -c cluster1 -l p1</pre>
+<pre class="brush: java; gutter: false; theme: Default">cluster/deploy remove -c cluster1 -l p1</pre>
 </div></div>
 
 <p>Use this command to remove the <code>org.apache.geronimo.samples/HelloWorld/1.0/car</code> plugin from plugin list p1:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">cluster/deploy remove -l p1 -a org.apache.geronimo.samples/HelloWorld/1.0/car -s 9.186.10.157</pre>
+<pre class="brush: java; gutter: false; theme: Default">cluster/deploy remove -l p1 -a org.apache.geronimo.samples/HelloWorld/1.0/car -s 9.186.10.157</pre>
 </div></div>
 
 <p>Access the <strong>Plugin</strong> portlet form the <strong>Administration console</strong> to verify the installation result for all farm members.</p>

Modified: websites/production/geronimo/content/GMOxDOC22/quick-debugging-jsps-of-your-application.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/quick-debugging-jsps-of-your-application.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/quick-debugging-jsps-of-your-application.html Mon May 21 13:00:07 2018
@@ -104,7 +104,7 @@ Starting from v2.2, there is a new optio
 To enable the feature for GEP, follow these steps:</p>
 <ol><li>Stop Geronimo server if it is running;</li><li>On the <strong>Servers</strong> view, double click the server to be configured. And select <strong>No re-deployment when only JSP files are updated</strong>  on the result panel; A message window will pop up with instructions.</li><li>Edit <code>&lt;GERONIMO_HOME&gt;/var/catalina/conf/web.xml</code> file and set the <strong>development</strong> attribute for JSP pages to <code>true</code>.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>excerpt from web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;servlet&gt;
     &lt;servlet-name&gt;jsp&lt;/servlet-name&gt;
     &lt;servlet-class&gt;org.apache.jasper.servlet.JspServlet&lt;/servlet-class&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/removing-database-pools.data/InstalledJEEConnectors.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC22/replacing-default-realm-in-geronimo.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/replacing-default-realm-in-geronimo.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/replacing-default-realm-in-geronimo.html Mon May 21 13:00:07 2018
@@ -105,11 +105,11 @@
 
 <p>By default, Geronimo is using a .properties file realm for authentication named <code>geronimo-admin</code>, which is used by JMX server, Administration Console, Online-deploy and MEJB applications. However, you may not want to use it for production use. Alternatively, you can use database(SQL) or LDAP realms in a production environment. To demonstrate how to replace the default realm, we will use 2 samples as followed:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343393260 {padding: 0px;}
-div.rbtoc1523343393260 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343393260 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907320802 {padding: 0px;}
+div.rbtoc1526907320802 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907320802 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343393260">
+/*]]>*/</style><div class="toc-macro rbtoc1526907320802">
 <ul class="toc-indentation"><li><a shape="rect" href="#ReplacingdefaultRealminGeronimo-Withadatabase(SQL)realm">With a database(SQL) realm</a></li><li><a shape="rect" href="#ReplacingdefaultRealminGeronimo-WithaLDAPrealm">With a LDAP realm</a></li></ul>
 </div>
 
@@ -117,7 +117,7 @@ div.rbtoc1523343393260 li {margin-left:
 <p>In this example, we will use an embedded Derby database as the security provider.</p>
 <ol><li>Create a database named <code>SecurityDatabase</code> using <strong>DB manager</strong> on the administration console;</li><li>Create two tables <code>Users</code> and <code>Groups</code> to store user credential and group information;
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 create table users(username varchar(15),password varchar(15));
 create table groups(username varchar(15),groupname varchar(15));
 insert into users values('userone','p1');
@@ -129,7 +129,7 @@ insert into groups values('userthree','u
 </pre>
 </div></div></li><li>Create an Derby XA database pool named <code>SecurityDatabasePool</code> using <strong>Database Pools</strong> on the console;</li><li>Stop the server and update module <code>org.apache.geronimo.framework/server-security-config/2.2-SNAPSHOT/car</code> in the <code>&lt;Geronimo_Home&gt;/var/config/config.xml</code> file to enable the SQL realm.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;module name="org.apache.geronimo.framework/server-security-config/2.2-SNAPSHOT/car"&gt;
         &lt;gbean name="org.apache.geronimo.framework/server-security-config/2.2-SNAPSHOT/car?ServiceModule=org.apache.geronimo.framework/server-security-config/2.2-SNAPSHOT/car,j2eeType=LoginModule,name=security-realm" gbeanInfo="org.apache.geronimo.security.jaas.LoginModuleGBean"&gt;
             &lt;attribute name="loginModuleClass"&gt;org.apache.geronimo.security.realm.providers.SQLLoginModule&lt;/attribute&gt;
@@ -166,7 +166,7 @@ Where
 <h1 id="ReplacingdefaultRealminGeronimo-WithaLDAPrealm">With a LDAP realm</h1>
 <p>To replace the default .properties file realm using a LDAP realm, the configuration is nearly identical to the sample above. The only difference is to use <code>org.apache.geronimo.security.realm.providers.LDAPLogoinModule</code> as <code>LoginModuleClass</code>. Here is the code snippet you can use in <code>config.xml</code>:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;module name="org.apache.geronimo.framework/server-security-config/2.2-SNAPSHOT/car"&gt;
         &lt;gbean name="org.apache.geronimo.framework/server-security-config/2.2-SNAPSHOT/car?ServiceModule=org.apache.geronimo.framework/server-security-config/2.2-SNAPSHOT/car,j2eeType=LoginModule,name=security-realm" gbeanInfo="org.apache.geronimo.security.jaas.LoginModuleGBean"&gt;
             &lt;attribute name="loginModuleClass"&gt;org.apache.geronimo.security.realm.providers.LDAPLoginModule&lt;/attribute&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/running-geronimo-as-a-non-root-user.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/running-geronimo-as-a-non-root-user.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/running-geronimo-as-a-non-root-user.html Mon May 21 13:00:07 2018
@@ -106,7 +106,7 @@
 
 <ol><li>Create a new user (i.e. gmo) and add it to a specific user group. You could use the predefined <strong>www</strong> user group for instance.</li><li>Edit the .bashrc for the user you just created and add the PATH and JAVA_HOME variables:
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
     PATH=$PATH:&lt;java_home&gt;/bin
     export PATH
     JAVA_HOME=&lt;java_home&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/stateless-session-bean.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/stateless-session-bean.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/stateless-session-bean.html Mon May 21 13:00:07 2018
@@ -104,7 +104,7 @@
 
 <p>Here is an example of Simple Stateless Session Bean:</p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>StatelessBean.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 @Stateless
 public class StatelessBean implements StatelessBeanRemote
 {
@@ -134,11 +134,11 @@ System.out.println("This is a stateless
 <p>Details on installing eclipse are provided in the <a shape="rect" href="development-environment.html">Development environment</a> section. <br clear="none">
 This tutorial is organized in the following sections:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343349651 {padding: 0px;}
-div.rbtoc1523343349651 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343349651 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907284658 {padding: 0px;}
+div.rbtoc1526907284658 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907284658 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343349651">
+/*]]>*/</style><div class="toc-macro rbtoc1526907284658">
 <ul class="toc-indentation"><li><a shape="rect" href="#StatelessSessionBean-CreatingaStatelessSessionEJBproject">Creating a Stateless Session EJB project</a></li><li><a shape="rect" href="#StatelessSessionBean-Creatingadatabaseusingtheadministrativeconsole">Creating a database using the administrative console</a></li><li><a shape="rect" href="#StatelessSessionBean-CreatingadatasourceusingAdministrativeConsole">Creating a datasource using Administrative Console</a></li><li><a shape="rect" href="#StatelessSessionBean-Creatingapplicationclient">Creating application client</a></li><li><a shape="rect" href="#StatelessSessionBean-Fewmoreconfigurations">Few more configurations</a></li><li><a shape="rect" href="#StatelessSessionBean-DeployandRun">Deploy and Run</a></li></ul>
 </div>
 
@@ -149,7 +149,7 @@ div.rbtoc1523343349651 li {margin-left:
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="stateless-session-bean.data/createInterface.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>On the New Java Interface window give the package name as <em>statelessejb</em> and Interface name as <em>RegisterBeanRemote</em>.<br clear="none">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="stateless-session-bean.data/createInterface2.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Populate the <em>RegisterBeanRemote</em> interface with the following code.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>RegisterBeanRemote.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 package statelessejb;
 import javax.ejb.Remote;
 @Remote
@@ -163,7 +163,7 @@ public boolean verify(String username, S
 In the above code @Remote is a metadata annotation which marks the interface to be a Remote Interface. Metadata annotations are used to declare a class, interface or functions to have particular attributes. In this case the interface is marked to be a Remote Interface.</li><li>Right click on <strong>StatelessSessionEJB</strong> project and create a new class <em>RegisterBean</em> as shown in the figure.<br clear="none">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="stateless-session-bean.data/createClass.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Populate the class <em>RegisterBean</em> with the following data:
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>RegisterBean.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 package statelessejb;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -275,7 +275,7 @@ This completes the development of EJB pr
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="stateless-session-bean.data/createDB4.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Run the query as shown in the figure. This query will create table <strong>USERINFO</strong> with the columns <em>FIRSTNAME</em>, <em>LASTNAME</em>, <em>SEX</em>, <em>USERNAME</em>, <em>PASSWORD</em>.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="stateless-session-bean.data/createDB5.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>CreateTable.sql</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 CREATE TABLE USERINFO
 (
 FIRSTNAME char(20),
@@ -303,7 +303,7 @@ PASSWORD  char(20)
 <h2 id="StatelessSessionBean-Creatingapplicationclient">Creating application client</h2>
 <ol><li>Create a new dynamic Web Project with the name <em>ApplicationClient</em>.</li><li>Right click on <strong>WebContent</strong> and create the following <code>login.jsp</code>:
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>login.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%&gt;
 &lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
@@ -329,7 +329,7 @@ Enter your Password
 </div></div>
 This form is the login page for our application. Once the user enters his/her credentials, these are passed to another jsp <code>passCredentials.jsp</code> (checkout the action in the form tag) to verify the authenticity of user credentials. In case the user is new he has to go through the registration process. This statement <strong>&lt;a href="http://localhost:8080/ApplicationClient/register.jsp"&gt;NewUser&lt;/a&gt;</strong> is used to route the user to registration page.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>passCredentials.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page import="java.util.Properties,javax.naming.Context,javax.naming.InitialContext,statelessejb.RegisterBeanRemote" %&gt;
 &lt;html&gt;
 &lt;head&gt;
@@ -367,7 +367,7 @@ i=myejb.verify(s,s1);
 <div class="confluence-information-macro confluence-information-macro-tip"><p class="title">Why is the lookup name RegisterBeanRemote??</p><span class="aui-icon aui-icon-small aui-iconfont-approve confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p>This will be explained in the deploy an run section</p></div></div>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>resources.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%&gt;
 &lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
@@ -390,7 +390,7 @@ Come and Contribute to Apache Geronimo V
 </div></div>
 This is the final page of the application which displays the various resources.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>register.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%&gt;
 &lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
@@ -439,7 +439,7 @@ Select a Password&lt;br&gt;
 </div></div>
 This page is the registration page. Once th user fills up the form and press Submit a <strong>valform()</strong> function is called which validates the field username and password. In case any of them is empty an alert is send which suggests empty fields in the form. If all is fine <code>passVariables.jsp</code> is called.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>passVariables.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page import="java.util.Properties,javax.naming.Context,javax.naming.InitialContext,statelessejb.RegisterBeanRemote" %&gt;
 
 &lt;html&gt;
@@ -471,7 +471,7 @@ myejb.register(s,s1,s2,s3,s4);
 In this page the fields are retrieved from <code>register.jsp</code> and the register function in the bean class is called to populate the database.<br clear="none">
 The code <strong>&lt;meta http-equiv="Refresh" content="5;URL=<a shape="rect" class="external-link" href="http://localhost:8080/ApplicationClient/login.jsp" rel="nofollow">http://localhost:8080/ApplicationClient/login.jsp</a>"&gt;</strong> suggests to wait for 5 seconds and then move to login.jsp
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>index.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%&gt;
 &lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
@@ -488,7 +488,7 @@ The code <strong>&lt;meta http-equiv="Re
 
 <ol><li>In the EJB Project. Under <em>META-INF</em>, edit <code>openejb-jar.xml</code> and add the following
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>datasource dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;sys:dependencies&gt;
             &lt;sys:dependency&gt;
                 &lt;sys:groupId&gt;console.dbpool&lt;/sys:groupId&gt;
@@ -499,7 +499,7 @@ The code <strong>&lt;meta http-equiv="Re
 </div></div>
 Finally the <code>openejb-jar.xml</code> will look like this
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>openejb-jar.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.2" 
 xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"
@@ -527,7 +527,7 @@ xmlns:sys="http://geronimo.apache.org/xm
 <div class="confluence-information-macro confluence-information-macro-information"><p class="title">Where did the above dependencies come from??</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p>To make the datasource visible to EJB we need to add a dependency to the EJB deployment plan that is openejb-jar.xml. The above element can be obtained automatically from Geronimo Database Pool wizard. Select usage against the database pool jdbc/userds</p></div></div></li><li>In the WEB Project. Under WEB-INF, Edit geronimo-web.xml and add the following
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>EJB dependency</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;sys:dependencies&gt;
        &lt;sys:dependency&gt;
             &lt;sys:groupId&gt;default&lt;/sys:groupId&gt;
@@ -540,7 +540,7 @@ xmlns:sys="http://geronimo.apache.org/xm
 </div></div>
 Finally the <code>geronimo-web.xml</code> will look like this
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" 
 xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" 

Modified: websites/production/geronimo/content/GMOxDOC22/substituting-one-module-with-another.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/substituting-one-module-with-another.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/substituting-one-module-with-another.html Mon May 21 13:00:07 2018
@@ -107,14 +107,14 @@
 <p>Recall that the Geronimo repository, like a maven 2 repository, is structured like</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 /path/like/groupId/artifactId/version/artifactId-version.type
 </pre>
 </div></div>
 
 <p>An artifact is structured like</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 path.like.groupId/artifactId/version/type
 </pre>
 </div></div>

Modified: websites/production/geronimo/content/GMOxDOC22/tomcat-native-clustering.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/tomcat-native-clustering.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/tomcat-native-clustering.html Mon May 21 13:00:07 2018
@@ -103,11 +103,11 @@
 <p>The Tomcat Web container provides a native clustering solution that can be configured through Geronimo using gbean definitions within <code>config.xml</code> or using <code>server.xml</code> starting from v2.2 just like you did for a standalone Tomcat server.  This document will go through the available GBeans and how to configure them for clustering in a Geronimo server with a tomcat web container.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343372017 {padding: 0px;}
-div.rbtoc1523343372017 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343372017 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907307274 {padding: 0px;}
+div.rbtoc1526907307274 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907307274 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343372017">
+/*]]>*/</style><div class="toc-macro rbtoc1526907307274">
 <ul class="toc-indentation"><li><a shape="rect" href="#TomcatNativeClustering-ClusterConfigurationElements">Cluster Configuration Elements</a></li><li><a shape="rect" href="#TomcatNativeClustering-Settingupaclusteringenvironment">Setting up a clustering environment</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#TomcatNativeClustering-Planningyourcluster">Planning your cluster</a></li><li><a shape="rect" href="#TomcatNativeClustering-PreparingyourWebapplication">Preparing your Web application</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#TomcatNativeClustering-Enablingsessionaffinity">Enabling session affinity</a></li></ul>
@@ -157,7 +157,7 @@ div.rbtoc1523343372017 li {margin-left:
 <p>To participate in a cluster configuration, your Web application must be implemented correctly.</p>
 <ul><li>Ensure that every object placed in the HTTP session implements java.io.Serializable. The clustering feature serializes the objects when it distributes them to the other nodes in the cluster.</li><li>The deployment descriptor for your Web application, that is the <code>web.xml</code> file in the Web archive, must indicate that your Web application is distributable. To do this, insert the <strong>distributable</strong> element in the deployment descriptor.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Excerpt from web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
 &lt;!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
@@ -181,7 +181,7 @@ div.rbtoc1523343372017 li {margin-left:
 
 <ol><li>For every node in the cluster, update <code>server.xml</code> as followed after the server is stopped:
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Excerpt from server.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
  ...
  &lt;Engine name="Catalina" defaultHost="${ServerHostname}" jvmRoute="nodeId"&gt;
  ...
@@ -204,7 +204,7 @@ where
 <h2 id="TomcatNativeClustering-SampleTomcatclusteringwithmulticastConfiguration">Sample Tomcat clustering with multicast Configuration</h2>
 <p>Here is the template for your Web application deployment plan. See <a shape="rect" href="creating-deployment-plans-for-web-applications.html">Creating deployment plans for Web applications</a> for more information about the parameters.</p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
 
@@ -369,7 +369,7 @@ where
 <p>To convert this example to a multicast configuration, the <code>DisableMCastInterceptor</code>, <code>StaticMemberInterceptor</code>, and <code>StaticMember</code> definitions should be removed.  Also, the value for the <em>address</em> attribute for the <code>ReceiverGBean</code> definition should be changed to <strong>auto</strong>. </p>
 
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>excerpt from geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
     &lt;cluster&gt;TomcatCluster&lt;/cluster&gt;
         &lt;gbean name="TomcatCluster" class="org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean"&gt;
@@ -528,7 +528,7 @@ where
 
 <p>Interceptors can perform actions when a message is sent or received. Use a reference <code>NextInterceptor</code> in interceptor configurations to chain interceptors together. You can control how the client requests are processed by arranging the order of the interceptor chain. In the following sample code, when the <code>TcpFailureDetector</code> intercepter catches errors, it calls the next interceptor <code>StaticMember1Interceptor</code>. The static member referenced inside <code>StaticMember1Interceptor</code>, static member 2 in this example, will immediately take over the work of the first static member. </p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>excerpt of interceptor chain</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
 &lt;gbean name="TcpFailureDetector" class="org.apache.geronimo.tomcat.cluster.ChannelInterceptorGBean"&gt;
  	 &lt;attribute name="className"&gt;org.apache.catalina.tribes.group.interceptors.TcpFailureDetector&lt;/attribute&gt;
@@ -554,7 +554,7 @@ where
 
 <p>All the static members involved should be defined in the deployment plan as well as the relationship between these static members. Use a reference <code>NextStaticMember</code> in the definition of each static member, except for the last one, to chain static members together. When static member 2 in this example fails to take over the work, static member 3 will immediately take over the work. It is the same for longer static  member chain. When a static member fails to take over the work of the previous static member, it calls the next static member in the chain. The request is passed along until a static member can handle the work or it gets to the end. </p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>excerpt of static member chain</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
 &lt;gbean name="StaticMember2" class="org.apache.geronimo.tomcat.cluster.StaticMemberGBean"&gt;
 	  	 &lt;attribute name="className"&gt;org.apache.catalina.tribes.membership.StaticMember&lt;/attribute&gt;
@@ -574,7 +574,7 @@ where
 
 <p>See the following deployment plan snippet as a complete example of setting up application-scoped unicast clustering with more than two nodes. </p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>excerpt from geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
  	 &lt;cluster&gt;TomcatCluster&lt;/cluster&gt;
  	 &lt;gbean name="TomcatCluster" class="org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean"&gt;
@@ -741,7 +741,7 @@ where
 
 <h2 id="TomcatNativeClustering-Samplemulticastconfigurationcode">Sample multicast configuration code</h2>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>server.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
      &lt;Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8"&gt;
                     &lt;Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false" notifyListenersOnReplication="true" name="${clusterName}" channelSendOptions="6" mapSendOptions="6"/&gt;
@@ -767,7 +767,7 @@ where
 
 <h2 id="TomcatNativeClustering-Sampleunicastconfigurationcode">Sample unicast configuration code</h2>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>server.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ...
     &lt;Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" channelSendOptions="8"&gt;
                     &lt;Manager className="org.apache.catalina.ha.session.DeltaManager" expireSessionsOnShutdown="false" notifyListenersOnReplication="true" name="${clusterName}" channelSendOptions="6" mapSendOptions="6"/&gt;

Modified: websites/production/geronimo/content/GMOxDOC22/using-datasource-pool-wizard-in-gep.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/using-datasource-pool-wizard-in-gep.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/using-datasource-pool-wizard-in-gep.html Mon May 21 13:00:07 2018
@@ -151,7 +151,7 @@
 
 <p>Now you have created a new datasource pool. You can click the <strong>Source</strong> tab to review the deployment plan of the connector. The following figure shows a sample deployment plan with a new datasource connector embedded:<br clear="none" class="atl-forced-newline"></p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>geronimo-application.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;app:application application-name="TestEAR" xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" 
 xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" 
 xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2" 

Modified: websites/production/geronimo/content/GMOxDOC22/using-spnego-in-geronimo.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC22/using-spnego-in-geronimo.html (original)
+++ websites/production/geronimo/content/GMOxDOC22/using-spnego-in-geronimo.html Mon May 21 13:00:07 2018
@@ -104,11 +104,11 @@
 <p>Using the <a shape="rect" class="external-link" href="ftp://ftp.isi.edu/in-notes/rfc2478.txt" rel="nofollow" title="SPNEGO">Simple and Protected GSS-API Negotiation Mechanism(SPNEGO)</a> in Geronimo allows HTTP users to log in and authenticate only once in their desktop, then they can receive automatic authentication from the Geronimo server. Note that the feature is only supported in Geronimo 2.2.1 or later versions.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343396328 {padding: 0px;}
-div.rbtoc1523343396328 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343396328 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907324125 {padding: 0px;}
+div.rbtoc1526907324125 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907324125 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343396328">
+/*]]>*/</style><div class="toc-macro rbtoc1526907324125">
 <ul class="toc-indentation"><li><a shape="rect" href="#UsingSPNEGOinGeronimo-Prerequisite">Prerequisite</a></li><li><a shape="rect" href="#UsingSPNEGOinGeronimo-Procedure">Procedure</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#UsingSPNEGOinGeronimo-SettinguptheDomainControllerMachine">Setting up the Domain Controller Machine</a></li><li><a shape="rect" href="#UsingSPNEGOinGeronimo-SettinguptheClientApplicationMachine">Setting up the Client Application Machine</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#UsingSPNEGOinGeronimo-EnableSPNEGOauthenticationinMicrosoftInternetExplorerbrowser">Enable SPNEGO authentication in Microsoft Internet Explorer browser</a></li><li><a shape="rect" href="#UsingSPNEGOinGeronimo-EnableSPNEGOauthenticationinFirefox">Enable SPNEGO authentication in Firefox</a></li></ul>
@@ -153,7 +153,7 @@ where
 <h2 id="UsingSPNEGOinGeronimo-SettinguptheGeronimoserver">Setting up the Geronimo server</h2>
 <ol><li>Copy the Keroes keytab file <code>krb5.keytab</code> to one of directories of your Geronimo Server. The file was created during <a shape="rect" href="using-spnego-in-geronimo.html">Setting up the Domain Controller Machine</a>.</li><li>Create a basic Kerbeores configuration file named <code>krb5.ini</code> in order to use the SPNEGO for the server. The files should be stored on local server and with the following keys list defining the Kerberoes key distribution center(KDC) name and the realm setting for the SPNEGO authentication.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>krb5.ini</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;"> 
+<pre class="brush: java; gutter: false; theme: Default"> 
 [libdefaults]
   default_realm = XYZ.COM
   default_keytab_name = FILE:c:\winnt\krb5.keytab
@@ -174,7 +174,7 @@ where
 <p>set JAVA_OPTS=-Djava.security.krb5.conf=C:\winnt\krb5.ini -Dcom.ibm.security.jgss.debug=all -Dcom.ibm.security.krb5.Krb5Debug=all -Djavax.security.auth.useSubjectCredsOnly=false</p>
 </div></div></li><li>Create a system-scope realm for the Geronimo server as followed. The sample code is a combination of SPNEGO and .properties file realms in order that the authentication will fall back on .Properties realm once the SPNEGO authentication fails. You can remove the .properties file realm if unnecessary.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>spnego_properties_realm.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
     &lt;environment&gt;
         &lt;moduleId&gt;
@@ -254,7 +254,7 @@ where
 </pre>
 </div></div></li><li>Configure the deployment plan of your application to make sure the SPNEGO realm is invoked properly. See the sample code below for reference.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web:web-app xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"    xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" 
         xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" 
@@ -293,7 +293,7 @@ where
 </pre>
 </div></div></li><li>Configure the deployment descriptor to make sure your application uses SPNEGO authentication and the respective realm provider that Geronimo server supports.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>excerpt of web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
 ...
    &lt;login-config&gt;

Modified: websites/production/geronimo/content/GMOxDOC30/accessing-ejb-in-web-applications.data/ganymede_CreateEJB3a.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC30/accessing-ejb-in-web-applications.data/ganymede_createproj3.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC30/accessing-ejb-in-web-applications.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/accessing-ejb-in-web-applications.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/accessing-ejb-in-web-applications.html Mon May 21 13:00:07 2018
@@ -127,11 +127,11 @@ under the License.
 
 <p>Details on installing eclipse are provided in the <a shape="rect" href="development-environment.html">Development environment</a> section. This tutorial is organized in the following sections:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343420623 {padding: 0px;}
-div.rbtoc1523343420623 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343420623 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907347346 {padding: 0px;}
+div.rbtoc1526907347346 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907347346 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343420623">
+/*]]>*/</style><div class="toc-macro rbtoc1526907347346">
 <ul class="toc-indentation"><li><a shape="rect" href="#AccessingEJBinWebapplications-DefineanewGeronimoServerRuntime">Define a new Geronimo Server Runtime</a></li><li><a shape="rect" href="#AccessingEJBinWebapplications-CreatingaEJBProject">Creating a EJB Project</a></li><li><a shape="rect" href="#AccessingEJBinWebapplications-CreatingaDynamicWebProject">Creating a Dynamic Web Project</a></li><li><a shape="rect" href="#AccessingEJBinWebapplications-AddingcodetoEJBProject">Adding code to EJB Project</a></li><li><a shape="rect" href="#AccessingEJBinWebapplications-AddingcodetoWebProject">Adding code to Web Project</a></li><li><a shape="rect" href="#AccessingEJBinWebapplications-Somemoreconfigurations">Some more configurations</a></li><li><a shape="rect" href="#AccessingEJBinWebapplications-DeployandRun">Deploy and Run</a></li></ul>
 </div>
 
@@ -172,7 +172,7 @@ div.rbtoc1523343420623 li {margin-left:
 <h1 id="AccessingEJBinWebapplications-AddingcodetoEJBProject">Adding code to EJB Project</h1>
 <ol><li>Add the following code to the interface <code>Converter.java</code>.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>Converter.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 package ejb;
 
 import java.math.BigDecimal;
@@ -188,7 +188,7 @@ public interface Converter {
 </div></div>
 Here the <strong>@Remote</strong> annotation is used to declare it as a Remote Interface.<br clear="none" class="atl-forced-newline"></li><li>Add the following code to the class <code>ConverterBean.java</code>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>ConverterBean.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 package ejb;
 
 import java.math.BigDecimal;
@@ -218,7 +218,7 @@ This complete the EJB code.</li></ol>
 <h1 id="AccessingEJBinWebapplications-AddingcodetoWebProject">Adding code to Web Project</h1>
 <ol><li>Add the following code to <code>index.jsp</code>.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>index.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;html&gt;
 &lt;head&gt;
 &lt;title&gt;Converter&lt;/title&gt;
@@ -245,7 +245,7 @@ This complete the EJB code.</li></ol>
 
 <ol><li>Add the following code to <em>ConverterHandler</em> servlet.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>ConverterHandler.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 package webejb;
 import ejb.Converter;
 
@@ -291,7 +291,7 @@ The <strong>@EJB(name = "ejb/Converter")
 
 <ol><li>Modify the deployment plan that is <code>geronimo-web.xml</code> as follows:
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
 xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" 

Modified: websites/production/geronimo/content/GMOxDOC30/accessing-jdbc-in-web-applications.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/accessing-jdbc-in-web-applications.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/accessing-jdbc-in-web-applications.html Mon May 21 13:00:07 2018
@@ -130,11 +130,11 @@ under the License.
 <p>Details on installing eclipse are provided in the <a shape="rect" href="development-environment.html">Development environment</a> section. This tutorial is organized in the following sections:</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343411617 {padding: 0px;}
-div.rbtoc1523343411617 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343411617 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907340066 {padding: 0px;}
+div.rbtoc1526907340066 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907340066 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343411617">
+/*]]>*/</style><div class="toc-macro rbtoc1526907340066">
 <ul class="toc-indentation"><li><a shape="rect" href="#AccessingJDBCinWebapplications-CreatingadynamicWebproject">Creating a dynamic Web project</a></li><li><a shape="rect" href="#AccessingJDBCinWebapplications-Creatingadatabaseusingtheadministrativeconsole">Creating a database using the administrative console</a></li><li><a shape="rect" href="#AccessingJDBCinWebapplications-Creatingadatasourceusingtheadministrativeconsole">Creating a datasource using the administrative console</a></li><li><a shape="rect" href="#AccessingJDBCinWebapplications-Addingcodeforimageuploadtoderbydatabase">Adding code for image upload to derby database</a></li><li><a shape="rect" href="#AccessingJDBCinWebapplications-Codetoretrievetheimagefromderbydatabase">Code to retrieve the image from derby database</a></li><li><a shape="rect" href="#AccessingJDBCinWebapplications-Modifyingdeploymentplan">Modifying deployment plan</a></li><li><a shape="rect" href="#AccessingJDBCinWebapplications-Deployandrun">Deploy an
 d run</a></li></ul>
 </div>
 
@@ -157,7 +157,7 @@ div.rbtoc1523343411617 li {margin-left:
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="accessing-jdbc-in-web-applications.data/createDB4.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Run the query as shown in the figure. This query will create table <em>PICTURES</em> with the columns <em>name</em> and <em>pic</em>.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="accessing-jdbc-in-web-applications.data/createDB5.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>CreateTable.sql</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 create table pictures(name varchar(32) not null primary key, pic blob(16M));
 </pre>
 </div></div>
@@ -180,7 +180,7 @@ create table pictures(name varchar(32) n
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="accessing-jdbc-in-web-applications.data/code2.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Select <strong>Finish</strong>. This will create a template for <code>index.jsp</code>.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="accessing-jdbc-in-web-applications.data/code3.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Add the following code to <code>index.jsp</code>.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>index.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%&gt;
 &lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
@@ -226,7 +226,7 @@ The <strong>&lt;form action="/WebJDBC/Im
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="accessing-jdbc-in-web-applications.data/code6.png"></span><br clear="none" class="atl-forced-newline"> </li><li>Select <strong>Finish</strong>.<br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="accessing-jdbc-in-web-applications.data/code7.png"></span> <br clear="none" class="atl-forced-newline"> </li><li>Add the following code to <code>ImageUpload.java</code>.
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>ImageUpload.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 package jdbc;
 
 import java.io.File;
@@ -303,7 +303,7 @@ doProcess(request, response);
 <h2 id="AccessingJDBCinWebapplications-Codetoretrievetheimagefromderbydatabase">Code to retrieve the image from derby database</h2>
 <ol><li>Create a <strong>JSP</strong> page with the name <code>ImageDownload.jsp</code>.</li><li>Add the following code to <code>ImageDownload.jsp</code>:
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>ImageDownload.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%&gt;
 &lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;
@@ -337,7 +337,7 @@ Name of the Image
 </div></div>
 As can be seen from <strong>&lt;form action="/WebJDBC/ImageDownload"&gt;</strong> this JSP requests the <strong>ImageDownload</strong> servlet when the form is submitted. </li><li>Create a new servlet <code>ImageDownload.java</code> and add the following code:
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>ImageDownload.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 package jdbc;
 
 import java.io.IOException;
@@ -425,7 +425,7 @@ import javax.sql.DataSource;
 <h2 id="AccessingJDBCinWebapplications-Modifyingdeploymentplan">Modifying deployment plan</h2>
 <p>The next step is to modify the <code>geronimo-web.xml</code> deployment plan. We need to add the dependency element for the <strong>JDBC</strong> resource. Also we need to add a resource reference element for the <em>userds</em> datasource.</p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
          xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"

Modified: websites/production/geronimo/content/GMOxDOC30/add-new-https-listener.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/add-new-https-listener.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/add-new-https-listener.html Mon May 21 13:00:07 2018
@@ -130,7 +130,7 @@ under the License.
 
 <p>Starting from v2.2, Geronimo uses <code>server.xml</code> to configure Tomcat. You need to update <code>server.xml</code> to use HTTPS Connector with APR enabled. Use the following code snippet as an example.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
        &lt;Connector name="TomcatWebSSLConnector" 
                    port="${HTTPSPort + PortOffset}"
                    host="${ServerHostname}"

Modified: websites/production/geronimo/content/GMOxDOC30/apache-aries-sample-applications.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/apache-aries-sample-applications.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/apache-aries-sample-applications.html Mon May 21 13:00:07 2018
@@ -146,7 +146,7 @@ It is possible to install and run severa
 <p>If you choose not to build the samples you can skip to <a shape="rect" href="apache-aries-sample-applications.html">Deploy the Aries Samples DataSource</a> <br clear="none">
 Download and unzip the source zip for the <a shape="rect" class="unresolved" href="#">Latest Apache Aries Release</a> of Aries Samples and build the project. </p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 cd samples-0.1-incubating/
 mvn install
 </pre>
@@ -159,12 +159,12 @@ mvn install
 
 <h2 id="ApacheAriessampleapplications-DeploytheAriesSamplesDataSourcearies-deploy">Deploy the Aries Samples DataSource <span class="confluence-anchor-link" id="ApacheAriessampleapplications-aries-deploy"></span></h2>
 <p>Each of the two samples requires a Datasource.  However, before you can deploy the Datasources you need to obtain the tranql-connector-derby-embed-xa rar.   Unfortunately, this was not included in the Geronimo 3.0-M1 server images (but will be included in future images).  </p>
-<ul><li>For 3.0-M1 release you can obtain the necessary rar from any of the ibiblio mirrors:   <a shape="rect" class="external-link" href="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tranql/tranql-connector-derby-embed-xa/1.6/" rel="nofollow">Tranql RAR for derby</a></li><li>You must also download the XML for the datasource definitions - located here: <a shape="rect" href="apache-aries-sample-applications.data/aries-datasource.xml?version=2&amp;modificationDate=1277208649000&amp;api=v2" data-linked-resource-id="23003152" data-linked-resource-version="2" data-linked-resource-type="attachment" data-linked-resource-default-alias="aries-datasource.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="21267180" data-linked-resource-container-version="25">aries-datasource.xml</a>. Or you can download <code>aries-datasource</code> plugin directly from Geronimo <a shape="rect" class="external-link" href="http://geronimo.apache.o
 rg/plugins/samples-3.0-M1/">samples plugin repository</a>.</li></ul>
+<ul><li>For 3.0-M1 release you can obtain the necessary rar from any of the ibiblio mirrors:   <a shape="rect" class="external-link" href="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tranql/tranql-connector-derby-embed-xa/1.6/" rel="nofollow">Tranql RAR for derby</a></li><li>You must also download the XML for the datasource definitions - located here: <a shape="rect" href="apache-aries-sample-applications.data/aries-datasource.xml?version=2&amp;modificationDate=1277208649000&amp;api=v2" data-linked-resource-id="23003152" data-linked-resource-version="2" data-linked-resource-type="attachment" data-linked-resource-default-alias="aries-datasource.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="21267180" data-linked-resource-container-version="27">aries-datasource.xml</a>. Or you can download <code>aries-datasource</code> plugin directly from Geronimo <a shape="rect" class="external-link" href="http://geronimo.apache.o
 rg/plugins/samples-3.0-M1/">samples plugin repository</a>.</li></ul>
 
 
 <p>After you have both of the necessary files in your local file system use the following command to deploy the datasource:  </p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 ./bin/deploy -u system -p manager deploy tranql-connector-derby-embed-xa-1.6.rar aries-datasource.xml
 </pre>
 </div></div>
@@ -172,7 +172,7 @@ mvn install
 <h2 id="ApacheAriessampleapplications-DeploytheSampleEBA">Deploy the Sample EBA </h2>
 <p>Deploy the Blog or AriesTrader EBAs using the Geronimo web console or the following commands (NOTE: you should only deploy one version of each sample at a time - for example only the jdbc Blog or jpa Blog sample and not both concurrently):</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 Blog jdbc
 ./bin/deploy -u system -p manager deploy org.apache.aries.samples.blog.jdbc.eba-0.1-incubating.eba
 Blog jpa

Modified: websites/production/geronimo/content/GMOxDOC30/aries-datasource-datasouce-plugin-for-aries-sample-applications.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/aries-datasource-datasouce-plugin-for-aries-sample-applications.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/aries-datasource-datasouce-plugin-for-aries-sample-applications.html Mon May 21 13:00:07 2018
@@ -119,7 +119,7 @@ under the License.
           <div class="wiki-content maincontent">
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>pom.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
 
@@ -227,7 +227,7 @@ under the License.
 </div></div>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>plan.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"&gt;
     &lt;resourceadapter&gt;

Modified: websites/production/geronimo/content/GMOxDOC30/assembling-a-server-via-console.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/assembling-a-server-via-console.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/assembling-a-server-via-console.html Mon May 21 13:00:07 2018
@@ -124,11 +124,11 @@ under the License.
 <p>The application client referred to in this tutorial is actually a Web Application Client.</p></div></div>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343431026 {padding: 0px;}
-div.rbtoc1523343431026 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343431026 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907361037 {padding: 0px;}
+div.rbtoc1526907361037 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907361037 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343431026">
+/*]]>*/</style><div class="toc-macro rbtoc1526907361037">
 <ul class="toc-indentation"><li><a shape="rect" href="#AssemblingaserverviaConsole-Identifyingthefunctionalcomponentsrequiredbyourserver">Identifying the functional components required by our server</a></li><li><a shape="rect" href="#AssemblingaserverviaConsole-Assemblingacustomserver">Assembling a custom server</a></li></ul>
 </div>
 <h1 id="AssemblingaserverviaConsole-Identifyingthefunctionalcomponentsrequiredbyourserver">Identifying the functional components required by our server</h1>

Modified: websites/production/geronimo/content/GMOxDOC30/building-geronimo-from-eclipse.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/building-geronimo-from-eclipse.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/building-geronimo-from-eclipse.html Mon May 21 13:00:07 2018
@@ -185,7 +185,7 @@ and on windows its usually at
 
 <div class="confluence-information-macro confluence-information-macro-information"><p class="title">Info:</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <ul><li>If you plan on contributing code or patches to the project, you have to configure eclipse to not use tabs. Select <strong>Window &gt; Preferences &gt; Java &gt; Code Style &gt; Formatter &gt; Java Conventions <code>[built-in]</code></strong>, and click on <strong>Edit</strong>. Under Indentation select Tab policy as "space only". Enter a new name for this profile and click <strong>OK</strong>.</li><li>You might want to configure the Geronimo development environment by importing the Geronimo formatter and code template files.
-	<ul><li>Click  <strong>Window &gt; Preferences &gt; Java &gt; Code Style &gt; Formatter &gt; Import</strong>, and specify local path of <a shape="rect" href="building-geronimo-from-eclipse.data/Geronimo-template-formatter.xml?version=1&amp;modificationDate=1244676755000&amp;api=v2" data-linked-resource-id="20874045" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="Geronimo-template-formatter.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645292" data-linked-resource-container-version="22">Geronimo-template-formatter.xml</a>.</li><li>Click <strong>Window &gt; Preferences &gt; Java &gt; Code Style &gt; Code Templates &gt; Import</strong>, and specify the path of <a shape="rect" href="building-geronimo-from-eclipse.data/Geronimo-template-code.xml?version=1&amp;modificationDate=1244676755000&amp;api=v2" data-linked-resource-id="20874046" data-linked-resource-vers
 ion="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="Geronimo-template-code.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645292" data-linked-resource-container-version="22">Geronimo-template-code.xml</a>.</li></ul>
+	<ul><li>Click  <strong>Window &gt; Preferences &gt; Java &gt; Code Style &gt; Formatter &gt; Import</strong>, and specify local path of <a shape="rect" href="building-geronimo-from-eclipse.data/Geronimo-template-formatter.xml?version=1&amp;modificationDate=1244676755000&amp;api=v2" data-linked-resource-id="20874045" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="Geronimo-template-formatter.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645292" data-linked-resource-container-version="24">Geronimo-template-formatter.xml</a>.</li><li>Click <strong>Window &gt; Preferences &gt; Java &gt; Code Style &gt; Code Templates &gt; Import</strong>, and specify the path of <a shape="rect" href="building-geronimo-from-eclipse.data/Geronimo-template-code.xml?version=1&amp;modificationDate=1244676755000&amp;api=v2" data-linked-resource-id="20874046" data-linked-resource-vers
 ion="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="Geronimo-template-code.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645292" data-linked-resource-container-version="24">Geronimo-template-code.xml</a>.</li></ul>
 	</li></ul>
 </div></div></div>
         </div>



Mime
View raw message