geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1030161 [9/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/GMOxDOC30/building-j2g-from-source.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/building-j2g-from-source.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/building-j2g-from-source.html Mon May 21 13:00:07 2018
@@ -118,11 +118,11 @@ under the License.
         <div class="wiki-content">
           <div class="wiki-content maincontent">
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343453902 {padding: 0px;}
-div.rbtoc1523343453902 ul {list-style: disc;margin-left: 0px;padding-left: 20px;}
-div.rbtoc1523343453902 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907380806 {padding: 0px;}
+div.rbtoc1526907380806 ul {list-style: disc;margin-left: 0px;padding-left: 20px;}
+div.rbtoc1526907380806 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343453902">
+/*]]>*/</style><div class="toc-macro rbtoc1526907380806">
 <ul class="toc-indentation"><li><a shape="rect" href="#BuildingJ2Gfromsource-Buildingfromsource">Building from source</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#BuildingJ2Gfromsource-Prerequisites">Prerequisites</a></li><li><a shape="rect" href="#BuildingJ2Gfromsource-ObtainingtheSourceCode">Obtaining the Source Code</a></li><li><a shape="rect" href="#BuildingJ2Gfromsource-Building">Building</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#BuildingJ2Gfromsource-DisablingTests">Disabling Tests</a></li></ul>

Modified: websites/production/geronimo/content/GMOxDOC30/configure-apache-httpd-as-a-reverse-proxy-modproxy.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configure-apache-httpd-as-a-reverse-proxy-modproxy.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configure-apache-httpd-as-a-reverse-proxy-modproxy.html Mon May 21 13:00:07 2018
@@ -123,13 +123,13 @@ under the License.
 
 <ol><li>Open the <code>httpd.conf</code> file located in the <code>&lt;httpd_home&gt;\conf</code> directory.</li><li>Look for the following LoadModule directives and uncomment them by removing the <strong>#</strong> at the beginning of the line.
 <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">
 LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
 </pre>
 </div></div></li><li>At the bottom of the <code>httpd.conf</code> file, add the following lines to enable the re-routing.
 <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">
 ProxyPass /console http://localhost:8080/console
 ProxyPass /images http://localhost:8080/images
 ProxyPassreverse / http://localhost:8080/
@@ -149,7 +149,7 @@ ProxyPassreverse / http://localhost:8080
 
 <p><strong>Note:</strong> If you prefer to use <strong>mod_proxy_ajp</strong> rather than <strong>mod_proxy_http</strong>, you need to load <code>proxy_ajp_module</code> in <code>httpd.conf</code> and change the routing port to 8009(default) as follows:</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">
 LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 ...

Modified: websites/production/geronimo/content/GMOxDOC30/configure-apache-httpd-with-jakarta-tomcat-connector-modjk.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configure-apache-httpd-with-jakarta-tomcat-connector-modjk.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configure-apache-httpd-with-jakarta-tomcat-connector-modjk.html Mon May 21 13:00:07 2018
@@ -126,7 +126,7 @@ under the License.
 
 <p>In addition to <strong>mod_jk</strong>, you will require a <code>workers.properties</code> file, also available with the Apache Tomcat source distribution. This properties file tells the <strong>mod_jk</strong> plugin how to connect to the Geronimo server. For a detailed explanation on all the available options for configuring the Jakarta Tomcat Connector, visit <a shape="rect" class="external-link" href="http://tomcat.apache.org/connectors-doc/config/workers.html">http://tomcat.apache.org/connectors-doc/config/workers.html</a>.</p>
 
-<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>For practical purposes, the module <a shape="rect" href="configure-apache-httpd-with-jakarta-tomcat-connector-modjk.data/mod_jk-apache-2.2.3.so?version=1&amp;modificationDate=1203494952000&amp;api=v2" data-linked-resource-id="20874112" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="mod_jk-apache-2.2.3.so" data-linked-resource-content-type="application/octet-stream" data-linked-resource-container-id="20645305" data-linked-resource-container-version="22">mod_jk-apache-2.2.3.so</a> for Windows and the <a shape="rect" href="configure-apache-httpd-with-jakarta-tomcat-connector-modjk.data/workers.properties?version=1&amp;modificationDate=1203494952000&amp;api=v2" data-linked-resource-id="20874113" data-
 linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="workers.properties" data-linked-resource-content-type="application/octet-stream" data-linked-resource-container-id="20645305" data-linked-resource-container-version="22">workers.properties</a> are included in the <strong>Attachments</strong> section in this article.</p></div></div>
+<div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>For practical purposes, the module <a shape="rect" href="configure-apache-httpd-with-jakarta-tomcat-connector-modjk.data/mod_jk-apache-2.2.3.so?version=1&amp;modificationDate=1203494952000&amp;api=v2" data-linked-resource-id="20874112" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="mod_jk-apache-2.2.3.so" data-linked-resource-content-type="application/octet-stream" data-linked-resource-container-id="20645305" data-linked-resource-container-version="24">mod_jk-apache-2.2.3.so</a> for Windows and the <a shape="rect" href="configure-apache-httpd-with-jakarta-tomcat-connector-modjk.data/workers.properties?version=1&amp;modificationDate=1203494952000&amp;api=v2" data-linked-resource-id="20874113" data-
 linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="workers.properties" data-linked-resource-content-type="application/octet-stream" data-linked-resource-container-id="20645305" data-linked-resource-container-version="24">workers.properties</a> are included in the <strong>Attachments</strong> section in this article.</p></div></div>
 
 <p><a shape="rect" href="configure-apache-httpd-with-jakarta-tomcat-connector-modjk.html">Back to Top</a></p>
 

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.data/DB2_2.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.data/DB2_3.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.data/DB2_4.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.data/DB2_5.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.data/databasePoolCreate.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configuring-a-db2-datasource.html Mon May 21 13:00:07 2018
@@ -183,7 +183,7 @@ and copy the <strong>db2jcc_license_cisu
 <p>As an alternative to the wizard, you can create a deployment plan manually and deploy it by using the command line based deployer tool. To use this option, create a <strong>db2-plan.xml</strong> file and copy the content of the following example to the file.</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>db2-plan.xml 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;?xml version="1.0" encoding="UTF-8"?&gt;
 &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;

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-a-mysql-datasource.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configuring-a-mysql-datasource.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configuring-a-mysql-datasource.html Mon May 21 13:00:07 2018
@@ -126,7 +126,7 @@ under the License.
 
 
 <h1 id="ConfiguringaMySQLdatasource-CreatingadatasourceanddeployingitasastandaloneJEEconnectormodule">Creating a datasource and deploying it as a standalone JEE connector module</h1>
-<ol><li>See the attachment <a shape="rect" href="configuring-a-mysql-datasource.data/sample-mysql-xa-ds-plan-standalone.xml?version=1&amp;modificationDate=1232485735000&amp;api=v2" data-linked-resource-id="20874158" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="sample-mysql-xa-ds-plan-standalone.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645327" data-linked-resource-container-version="22">sample-mysql-xa-ds-plan-standalone.xml</a> to create a standalone Java EE connector deployment plan.</li><li>Install the mysql jdbc driver to the Geronimo repository by using the adminitration console, and ensure its Module ID is the same as the one defined in the sample plan. In this example, the Module ID of mysql JDBC driver is <code>mysql/mysql-connector-java/5.1.7/jar</code>.</li><li>Use <a shape="rect" href="deploying-and-undeploying-applications.html">command li
 ne</a> to deploy the datasource. Here is the sample command for deploying mysql xa datasource:
+<ol><li>See the attachment <a shape="rect" href="configuring-a-mysql-datasource.data/sample-mysql-xa-ds-plan-standalone.xml?version=1&amp;modificationDate=1232485735000&amp;api=v2" data-linked-resource-id="20874158" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="sample-mysql-xa-ds-plan-standalone.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645327" data-linked-resource-container-version="24">sample-mysql-xa-ds-plan-standalone.xml</a> to create a standalone Java EE connector deployment plan.</li><li>Install the mysql jdbc driver to the Geronimo repository by using the adminitration console, and ensure its Module ID is the same as the one defined in the sample plan. In this example, the Module ID of mysql JDBC driver is <code>mysql/mysql-connector-java/5.1.7/jar</code>.</li><li>Use <a shape="rect" href="deploying-and-undeploying-applications.html">command li
 ne</a> to deploy the datasource. Here is the sample command for deploying mysql xa datasource:
 <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>&lt;geronimo_home&gt;/bin/deploy.sh -u system -p manager deploy 
 &lt;GERONIMO_HOME&gt;/repository/org/tranql/tranql-connector-mysql-xa/1.2/tranql-connector-mysql-xa-1.2.rar sample-mysql-xa-ds-plan-standalone.xml
@@ -136,7 +136,7 @@ where <em>&lt;geronimo_home&gt;</em> is
 
 
 <h1 id="ConfiguringaMySQLdatasource-Embeddingadatasourcedefinitioninanapplicationdeploymentplan">Embedding a datasource definition in an application deployment plan</h1>
-<ol><li>See the attachment <a shape="rect" href="configuring-a-mysql-datasource.data/sample-mysql-xa-ds-plan-embeded.xml?version=1&amp;modificationDate=1232485735000&amp;api=v2" data-linked-resource-id="20874159" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="sample-mysql-xa-ds-plan-embeded.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645327" data-linked-resource-container-version="22">sample-mysql-xa-ds-plan-embeded.xml</a> to create an application deployment plan, and replace the web module and the ejb module according to your application.</li><li>Install the mysql jdbc driver to the Geronimo repository by using the adminitration console, and ensure its Module ID is the same as the one defined in the sample plan. In this example, the Module ID of mysql JDBC driver is <code>mysql/mysql-connector-java/5.1.7/jar</code>.</li><li>Use command line or adminitra
 tive console to <a shape="rect" href="deploying-and-undeploying-applications.html">deploy</a> your application with the deployment plan. For example, use the following command line:
+<ol><li>See the attachment <a shape="rect" href="configuring-a-mysql-datasource.data/sample-mysql-xa-ds-plan-embeded.xml?version=1&amp;modificationDate=1232485735000&amp;api=v2" data-linked-resource-id="20874159" data-linked-resource-version="1" data-linked-resource-type="attachment" data-linked-resource-default-alias="sample-mysql-xa-ds-plan-embeded.xml" data-nice-type="XML File" data-linked-resource-content-type="text/xml" data-linked-resource-container-id="20645327" data-linked-resource-container-version="24">sample-mysql-xa-ds-plan-embeded.xml</a> to create an application deployment plan, and replace the web module and the ejb module according to your application.</li><li>Install the mysql jdbc driver to the Geronimo repository by using the adminitration console, and ensure its Module ID is the same as the one defined in the sample plan. In this example, the Module ID of mysql JDBC driver is <code>mysql/mysql-connector-java/5.1.7/jar</code>.</li><li>Use command line or adminitra
 tive console to <a shape="rect" href="deploying-and-undeploying-applications.html">deploy</a> your application with the deployment plan. For example, use the following command line:
 <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>&lt;geronimo_home&gt;/bin/deploy.sh -u system -p manager deploy yourapp.ear sample-mysql-xa-ds-plan-embeded.xml
 </pre>
@@ -147,7 +147,7 @@ where <em>&lt;geronimo_home&gt;</em> is
 
 <p>The transaction configuration element is something like the following:</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;connectionmanager&gt;
   &lt;xa-transaction&gt;
      &lt;transaction-caching/&gt;
@@ -159,7 +159,7 @@ where <em>&lt;geronimo_home&gt;</em> is
 
 <p>And for local transaction:</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;connectionmanager&gt;
    &lt;local-transaction/&gt;
    ...

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-datasources.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configuring-datasources.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configuring-datasources.html Mon May 21 13:00:07 2018
@@ -146,10 +146,10 @@ under the License.
                           <a href="https://cwiki.apache.org/confluence/display/GMOxDOC30/Import+database+pools+from+WebLogic+8.1" title="Import database pools from WebLogic 8.1">Import database pools from WebLogic 8.1</a>
               <span class="smalltext">(Apache Geronimo v3.0)</span>
               <br>
-                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC30/Executing+SQL+statements+at+deployment+time" title="Executing SQL statements at deployment time">Executing SQL statements at deployment time</a>
+                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC30/Removing+database+pools" title="Removing database pools">Removing database pools</a>
               <span class="smalltext">(Apache Geronimo v3.0)</span>
               <br>
-                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC30/Removing+database+pools" title="Removing database pools">Removing database pools</a>
+                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC30/Executing+SQL+statements+at+deployment+time" title="Executing SQL statements at deployment time">Executing SQL statements at deployment time</a>
               <span class="smalltext">(Apache Geronimo v3.0)</span>
               <br>
                           <a href="https://cwiki.apache.org/confluence/display/GMOxDOC30/Using+the+Geronimo+database+pool+wizard" title="Using the Geronimo database pool wizard">Using the Geronimo database pool wizard</a>

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-http-header-based-authentication.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configuring-http-header-based-authentication.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configuring-http-header-based-authentication.html Mon May 21 13:00:07 2018
@@ -126,7 +126,7 @@ under the License.
 
 <p>Applications that use the HTTP header-based authentication must configure their deployment descriptor as follows:</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 a deployment descriptor</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;login-config&gt;
       &lt;auth-method&gt;GENERIC&lt;/auth-method&gt;
       &lt;realm-name&gt;TestPropsRealm&lt;/realm-name&gt;
@@ -144,7 +144,7 @@ under the License.
 <p>You can configure the security realm for HTTP header-based authentication. The following TestPropsRealm.xml file is a deployment plan used to create a <a shape="rect" class="unresolved" href="#">Properties file security realm</a> on the application server. Applications that use this security realm can achieve Single Sign-on.</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 TestPropsRealm.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;

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-run-as-and-default-subjects-and-principal-role-mapping.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configuring-run-as-and-default-subjects-and-principal-role-mapping.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configuring-run-as-and-default-subjects-and-principal-role-mapping.html Mon May 21 13:00:07 2018
@@ -128,21 +128,20 @@ under the License.
 
 <p>For each Subject accessible through a credential store, you need to specify an id, the realm to log in to, and credentials, which depend on the security realm requirements but are typically the name and password.  The schema is as follows:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
-    (the &quot;License&quot;); you may not use this file except in compliance with
+    (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
 
         http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+    distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
@@ -150,11 +149,11 @@ under the License.
 
 &lt;!-- $Rev$ $Date$ --&gt;
 
-&lt;xsd:schema xmlns:xsd=&quot;http://www.w3.org/2001/XMLSchema&quot;
-            xmlns:cs=&quot;http://geronimo.apache.org/xml/ns/credentialstore-1.0&quot;
-            targetNamespace=&quot;http://geronimo.apache.org/xml/ns/credentialstore-1.0&quot;
-            elementFormDefault=&quot;qualified&quot; attributeFormDefault=&quot;unqualified&quot;
-            version=&quot;1.0&quot;&gt;
+&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:cs="http://geronimo.apache.org/xml/ns/credentialstore-1.0"
+            targetNamespace="http://geronimo.apache.org/xml/ns/credentialstore-1.0"
+            elementFormDefault="qualified" attributeFormDefault="unqualified"
+            version="1.0"&gt;
 
     &lt;xsd:annotation&gt;
         &lt;xsd:documentation&gt;
@@ -162,11 +161,11 @@ under the License.
             CredentialStore configuration is
             specified by the element credential-store with namespace
             specified as xmlns =
-            &quot;http://geronimo.apache.org/xml/ns/credentialstore-1.0&quot;.
+            "http://geronimo.apache.org/xml/ns/credentialstore-1.0".
         &lt;/xsd:documentation&gt;
     &lt;/xsd:annotation&gt;
 
-    &lt;xsd:element name=&quot;credential-store&quot; type=&quot;cs:credential-storeType&quot;&gt;
+    &lt;xsd:element name="credential-store" type="cs:credential-storeType"&gt;
         &lt;xsd:annotation&gt;
             &lt;xsd:documentation&gt;
                 The root element for Geronimo credential store configuration. This
@@ -175,14 +174,14 @@ under the License.
         &lt;/xsd:annotation&gt;
     &lt;/xsd:element&gt;
 
-    &lt;xsd:complexType name=&quot;credential-storeType&quot;&gt;
+    &lt;xsd:complexType name="credential-storeType"&gt;
         &lt;xsd:annotation&gt;
             &lt;xsd:documentation&gt;
                 Defines the list of realms
             &lt;/xsd:documentation&gt;
         &lt;/xsd:annotation&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;realm&quot; type=&quot;cs:realmType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;&gt;
+            &lt;xsd:element name="realm" type="cs:realmType" minOccurs="0" maxOccurs="unbounded"&gt;
                 &lt;xsd:annotation&gt;
                     &lt;xsd:documentation&gt;
                         The realm element contains the credentials for subjects in that realm.
@@ -192,11 +191,11 @@ under the License.
         &lt;/xsd:sequence&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;realmType&quot;&gt;
+    &lt;xsd:complexType name="realmType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;subject&quot; type=&quot;cs:subjectType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
+            &lt;xsd:element name="subject" type="cs:subjectType" minOccurs="0" maxOccurs="unbounded"/&gt;
         &lt;/xsd:sequence&gt;
-        &lt;xsd:attribute name=&quot;name&quot; type=&quot;xsd:string&quot; use=&quot;required&quot;&gt;
+        &lt;xsd:attribute name="name" type="xsd:string" use="required"&gt;
             &lt;xsd:annotation&gt;
                 &lt;xsd:documentation&gt;
                     The name attribute specifies the login realm name
@@ -205,9 +204,9 @@ under the License.
         &lt;/xsd:attribute&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;subjectType&quot;&gt;
+    &lt;xsd:complexType name="subjectType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;id&quot; type=&quot;xsd:string&quot;&gt;
+            &lt;xsd:element name="id" type="xsd:string"&gt;
                 &lt;xsd:annotation&gt;
                     &lt;xsd:documentation&gt;
                         The id element serves to identify the subject externally. For subjects with meaningful
@@ -215,20 +214,20 @@ under the License.
                     &lt;/xsd:documentation&gt;
                 &lt;/xsd:annotation&gt;
             &lt;/xsd:element&gt;
-            &lt;xsd:element name=&quot;credential&quot; type=&quot;cs:credentialType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
+            &lt;xsd:element name="credential" type="cs:credentialType" minOccurs="0" maxOccurs="unbounded"/&gt;
         &lt;/xsd:sequence&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;credentialType&quot;&gt;
+    &lt;xsd:complexType name="credentialType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;type&quot; type=&quot;xsd:string&quot;&gt;
+            &lt;xsd:element name="type" type="xsd:string"&gt;
                 &lt;xsd:annotation&gt;
                     &lt;xsd:documentation&gt;
                         Class name or alias of the callback handler that will accept this credential
                     &lt;/xsd:documentation&gt;
                 &lt;/xsd:annotation&gt;
             &lt;/xsd:element&gt;
-            &lt;xsd:element name=&quot;value&quot; type=&quot;xsd:string&quot;&gt;
+            &lt;xsd:element name="value" type="xsd:string"&gt;
                 &lt;xsd:annotation&gt;
                     &lt;xsd:documentation&gt;
                         credential value as a string.
@@ -240,8 +239,7 @@ under the License.
 
 
 &lt;/xsd:schema&gt;
-]]></script>
-</div></div>
+</pre>
 
 
 <p>At the moment, Geronimo supplies callback handlers for name and password.  For other security realm requirements (e.g. certificates), you will have to write a callback handler.</p>
@@ -249,7 +247,7 @@ under the License.
 <p>A simple example of credential store configuration would look like this:</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>Credential Store Example</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="CredentialStore" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl"&gt;
         &lt;xml-attribute name="credentialStore"&gt;
             &lt;credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0"&gt;
@@ -305,22 +303,21 @@ under the License.
 
 <p>The schema for security configuration is as follows:</p>
 
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+Error rendering macro 'code': Invalid value specified for parameter 'java.lang.NullPointerException'<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
     this work for additional information regarding copyright ownership.
     The ASF licenses this file to You under the Apache License, Version 2.0
-    (the &quot;License&quot;); you may not use this file except in compliance with
+    (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+    distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
@@ -329,25 +326,25 @@ under the License.
 &lt;!-- $Rev$ $Date$ --&gt;
 
 &lt;xsd:schema
-        xmlns:xsd=&quot;http://www.w3.org/2001/XMLSchema&quot;
-        xmlns:j2ee=&quot;http://java.sun.com/xml/ns/j2ee&quot;
-        xmlns:geronimo=&quot;http://geronimo.apache.org/xml/ns/security-2.0&quot;
-        targetNamespace=&quot;http://geronimo.apache.org/xml/ns/security-2.0&quot;
-        xmlns:app=&quot;http://geronimo.apache.org/xml/ns/j2ee/application-2.0&quot;
-        xmlns:sys=&quot;http://geronimo.apache.org/xml/ns/deployment-1.2&quot;
-        elementFormDefault=&quot;qualified&quot;
-        attributeFormDefault=&quot;unqualified&quot;
-        version=&quot;2.0&quot;&gt;
-
-    &lt;xsd:import namespace=&quot;http://www.w3.org/XML/1998/namespace&quot; schemaLocation=&quot;http://www.w3.org/2001/xml.xsd&quot;/&gt;
-    &lt;xsd:import namespace=&quot;http://geronimo.apache.org/xml/ns/j2ee/application-2.0&quot; schemaLocation=&quot;geronimo-application-2.0.xsd&quot;/&gt;
-    &lt;xsd:import namespace=&quot;http://geronimo.apache.org/xml/ns/deployment-1.2&quot;  schemaLocation=&quot;geronimo-module-1.2.xsd&quot;/&gt;
-
-    &lt;xsd:element name=&quot;security&quot; type=&quot;geronimo:securityType&quot; substitutionGroup=&quot;app:security&quot;/&gt;
-    &lt;xsd:element name=&quot;credential-store&quot; type=&quot;sys:patternType&quot;/&gt;
-    &lt;xsd:element name=&quot;default-subject&quot; type=&quot;geronimo:subject-infoType&quot;/&gt;
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+        xmlns:geronimo="http://geronimo.apache.org/xml/ns/security-2.0"
+        targetNamespace="http://geronimo.apache.org/xml/ns/security-2.0"
+        xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+        xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+        version="2.0"&gt;
+
+    &lt;xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
+    &lt;xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/&gt;
+    &lt;xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"  schemaLocation="geronimo-module-1.2.xsd"/&gt;
+
+    &lt;xsd:element name="security" type="geronimo:securityType" substitutionGroup="app:security"/&gt;
+    &lt;xsd:element name="credential-store" type="sys:patternType"/&gt;
+    &lt;xsd:element name="default-subject" type="geronimo:subject-infoType"/&gt;
 
-    &lt;xsd:complexType name=&quot;securityType&quot;&gt;
+    &lt;xsd:complexType name="securityType"&gt;
         &lt;xsd:annotation&gt;
             &lt;xsd:documentation&gt;
                 Security entries
@@ -357,32 +354,32 @@ under the License.
             &lt;/xsd:documentation&gt;
         &lt;/xsd:annotation&gt;
         &lt;xsd:complexContent&gt;
-            &lt;xsd:extension base=&quot;app:abstract-securityType&quot;&gt;
+            &lt;xsd:extension base="app:abstract-securityType"&gt;
 
                 &lt;xsd:sequence&gt;
-                    &lt;xsd:element name=&quot;description&quot; type=&quot;geronimo:descriptionType&quot; minOccurs=&quot;0&quot;
-                                 maxOccurs=&quot;unbounded&quot;/&gt;
-                    &lt;xsd:element name=&quot;credential-store-ref&quot; type=&quot;sys:patternType&quot; minOccurs=&quot;0&quot;/&gt;
-                    &lt;xsd:element name=&quot;default-subject&quot; type=&quot;geronimo:subject-infoType&quot; minOccurs=&quot;0&quot;/&gt;
-                    &lt;xsd:element name=&quot;role-mappings&quot; type=&quot;geronimo:role-mappingsType&quot; minOccurs=&quot;0&quot;/&gt;
+                    &lt;xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
+                                 maxOccurs="unbounded"/&gt;
+                    &lt;xsd:element name="credential-store-ref" type="sys:patternType" minOccurs="0"/&gt;
+                    &lt;xsd:element name="default-subject" type="geronimo:subject-infoType" minOccurs="0"/&gt;
+                    &lt;xsd:element name="role-mappings" type="geronimo:role-mappingsType" minOccurs="0"/&gt;
                 &lt;/xsd:sequence&gt;
-                &lt;xsd:attribute name=&quot;doas-current-caller&quot; type=&quot;xsd:boolean&quot; default=&quot;false&quot;&gt;
+                &lt;xsd:attribute name="doas-current-caller" type="xsd:boolean" default="false"&gt;
                     &lt;xsd:annotation&gt;
                         &lt;xsd:documentation&gt;
-                            Set this attribute to &quot;true&quot; if the work is to be performed
+                            Set this attribute to "true" if the work is to be performed
                             as the calling Subject.
                         &lt;/xsd:documentation&gt;
                     &lt;/xsd:annotation&gt;
                 &lt;/xsd:attribute&gt;
-                &lt;xsd:attribute name=&quot;use-context-handler&quot; type=&quot;xsd:boolean&quot; default=&quot;false&quot;&gt;
+                &lt;xsd:attribute name="use-context-handler" type="xsd:boolean" default="false"&gt;
                     &lt;xsd:annotation&gt;
                         &lt;xsd:documentation&gt;
-                            Set this attribute to &quot;true&quot; if the installed JACC policy
+                            Set this attribute to "true" if the installed JACC policy
                             contexts will use PolicyContextHandlers.
                         &lt;/xsd:documentation&gt;
                     &lt;/xsd:annotation&gt;
                 &lt;/xsd:attribute&gt;
-                &lt;xsd:attribute name=&quot;default-role&quot; type=&quot;xsd:string&quot;&gt;
+                &lt;xsd:attribute name="default-role" type="xsd:string"&gt;
                     &lt;xsd:annotation&gt;
                         &lt;xsd:documentation&gt;
                             Used by the the Deployer to assign method permissions for
@@ -397,84 +394,84 @@ under the License.
         &lt;/xsd:complexContent&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;descriptionType&quot;&gt;
+    &lt;xsd:complexType name="descriptionType"&gt;
         &lt;xsd:simpleContent&gt;
-            &lt;xsd:extension base=&quot;xsd:string&quot;&gt;
-                &lt;xsd:attribute ref=&quot;xml:lang&quot;/&gt;
+            &lt;xsd:extension base="xsd:string"&gt;
+                &lt;xsd:attribute ref="xml:lang"/&gt;
             &lt;/xsd:extension&gt;
         &lt;/xsd:simpleContent&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;named-username-password-credentialType&quot;&gt;
+    &lt;xsd:complexType name="named-username-password-credentialType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;name&quot; type=&quot;xsd:string&quot;/&gt;
-            &lt;xsd:element name=&quot;username&quot; type=&quot;xsd:string&quot;/&gt;
-            &lt;xsd:element name=&quot;password&quot; type=&quot;xsd:string&quot;/&gt;
+            &lt;xsd:element name="name" type="xsd:string"/&gt;
+            &lt;xsd:element name="username" type="xsd:string"/&gt;
+            &lt;xsd:element name="password" type="xsd:string"/&gt;
         &lt;/xsd:sequence&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;role-mappingsType&quot;&gt;
+    &lt;xsd:complexType name="role-mappingsType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;role&quot; type=&quot;geronimo:roleType&quot; minOccurs=&quot;1&quot; maxOccurs=&quot;unbounded&quot;/&gt;
+            &lt;xsd:element name="role" type="geronimo:roleType" minOccurs="1" maxOccurs="unbounded"/&gt;
         &lt;/xsd:sequence&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;roleType&quot;&gt;
+    &lt;xsd:complexType name="roleType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;description&quot; type=&quot;geronimo:descriptionType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
-            &lt;xsd:element name=&quot;run-as-subject&quot; type=&quot;geronimo:subject-infoType&quot; minOccurs=&quot;0&quot;/&gt;
-            &lt;xsd:element name=&quot;realm-principal&quot; type=&quot;geronimo:realmPrincipalType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
-            &lt;xsd:element name=&quot;login-domain-principal&quot; type=&quot;geronimo:loginDomainPrincipalType&quot; minOccurs=&quot;0&quot;
-                         maxOccurs=&quot;unbounded&quot;/&gt;
-            &lt;xsd:element name=&quot;principal&quot; type=&quot;geronimo:principalType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
-            &lt;xsd:element name=&quot;distinguished-name&quot; type=&quot;geronimo:distinguishedNameType&quot; minOccurs=&quot;0&quot;
-                         maxOccurs=&quot;unbounded&quot;/&gt;
+            &lt;xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/&gt;
+            &lt;xsd:element name="run-as-subject" type="geronimo:subject-infoType" minOccurs="0"/&gt;
+            &lt;xsd:element name="realm-principal" type="geronimo:realmPrincipalType" minOccurs="0" maxOccurs="unbounded"/&gt;
+            &lt;xsd:element name="login-domain-principal" type="geronimo:loginDomainPrincipalType" minOccurs="0"
+                         maxOccurs="unbounded"/&gt;
+            &lt;xsd:element name="principal" type="geronimo:principalType" minOccurs="0" maxOccurs="unbounded"/&gt;
+            &lt;xsd:element name="distinguished-name" type="geronimo:distinguishedNameType" minOccurs="0"
+                         maxOccurs="unbounded"/&gt;
         &lt;/xsd:sequence&gt;
-        &lt;xsd:attribute name=&quot;role-name&quot; type=&quot;xsd:string&quot; use=&quot;required&quot;/&gt;
+        &lt;xsd:attribute name="role-name" type="xsd:string" use="required"/&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;realmPrincipalType&quot;&gt;
+    &lt;xsd:complexType name="realmPrincipalType"&gt;
         &lt;xsd:complexContent&gt;
-            &lt;xsd:extension base=&quot;geronimo:loginDomainPrincipalType&quot;&gt;
-                &lt;xsd:attribute name=&quot;realm-name&quot; type=&quot;xsd:string&quot; use=&quot;required&quot;/&gt;
+            &lt;xsd:extension base="geronimo:loginDomainPrincipalType"&gt;
+                &lt;xsd:attribute name="realm-name" type="xsd:string" use="required"/&gt;
             &lt;/xsd:extension&gt;
         &lt;/xsd:complexContent&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;loginDomainPrincipalType&quot;&gt;
+    &lt;xsd:complexType name="loginDomainPrincipalType"&gt;
         &lt;xsd:complexContent&gt;
-            &lt;xsd:extension base=&quot;geronimo:principalType&quot;&gt;
-                &lt;xsd:attribute name=&quot;domain-name&quot; type=&quot;xsd:string&quot; use=&quot;required&quot;/&gt;
+            &lt;xsd:extension base="geronimo:principalType"&gt;
+                &lt;xsd:attribute name="domain-name" type="xsd:string" use="required"/&gt;
             &lt;/xsd:extension&gt;
         &lt;/xsd:complexContent&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;principalType&quot;&gt;
+    &lt;xsd:complexType name="principalType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;description&quot; type=&quot;geronimo:descriptionType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
+            &lt;xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/&gt;
         &lt;/xsd:sequence&gt;
-        &lt;xsd:attribute name=&quot;class&quot; type=&quot;xsd:string&quot; use=&quot;required&quot;/&gt;
-        &lt;xsd:attribute name=&quot;name&quot; type=&quot;xsd:string&quot; use=&quot;required&quot;/&gt;
+        &lt;xsd:attribute name="class" type="xsd:string" use="required"/&gt;
+        &lt;xsd:attribute name="name" type="xsd:string" use="required"/&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;distinguishedNameType&quot;&gt;
+    &lt;xsd:complexType name="distinguishedNameType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;description&quot; type=&quot;geronimo:descriptionType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
+            &lt;xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/&gt;
         &lt;/xsd:sequence&gt;
-        &lt;xsd:attribute name=&quot;name&quot; type=&quot;xsd:string&quot; use=&quot;required&quot;/&gt;
+        &lt;xsd:attribute name="name" type="xsd:string" use="required"/&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;xsd:complexType name=&quot;subject-infoType&quot;&gt;
+    &lt;xsd:complexType name="subject-infoType"&gt;
         &lt;xsd:sequence&gt;
-            &lt;xsd:element name=&quot;description&quot; type=&quot;geronimo:descriptionType&quot; minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;/&gt;
-            &lt;xsd:element name=&quot;realm&quot; type=&quot;xsd:string&quot;/&gt;
-            &lt;xsd:element name=&quot;id&quot; type=&quot;xsd:string&quot;/&gt;
+            &lt;xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/&gt;
+            &lt;xsd:element name="realm" type="xsd:string"/&gt;
+            &lt;xsd:element name="id" type="xsd:string"/&gt;
         &lt;/xsd:sequence&gt;
     &lt;/xsd:complexType&gt;
 
-    &lt;!--&lt;xsd:complexType name=&quot;credential-storeType&quot;&gt;--&gt;
+    &lt;!--&lt;xsd:complexType name="credential-storeType"&gt;--&gt;
         &lt;!--&lt;xsd:sequence&gt;--&gt;
-            &lt;!--&lt;xsd:element name=&quot;pattern&quot; type=&quot;sys:patternType&quot;&gt;--&gt;
+            &lt;!--&lt;xsd:element name="pattern" type="sys:patternType"&gt;--&gt;
                 &lt;!--&lt;xsd:annotation&gt;--&gt;
                     &lt;!--&lt;xsd:documentation&gt;--&gt;
                         &lt;!--The pattern element defines a components of the--&gt;
@@ -488,8 +485,7 @@ under the License.
     &lt;!--&lt;/xsd:complexType&gt;--&gt;
 
 &lt;/xsd:schema&gt;
-]]></script>
-</div></div>
+</pre>
 
 
 <p>The credential store to use is specified in the credential-store-ref.  Normally you only need only supply the name component of the credential store name: for most purposes you are likely to include an app specific credential store in the application plan, but otherwise you need to assure that the credential store gbean is in the ancestor configurations of the application.</p>
@@ -497,7 +493,7 @@ under the License.
 <p>A default subject or each run-as role specifies the information needed to get the subject using a subject-infoType element.</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>Example Security Configuration</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;security use-context-handler="false" xmlns="http://geronimo.apache.org/xml/ns/security-2.0"&gt;
         &lt;default-subject&gt;
           &lt;realm&gt;my-properties-realm&lt;/realm&gt;
@@ -522,7 +518,7 @@ under the License.
 <p>The sample above shows the simplest principal-role mapping: you specify the principal class and name for each principal that maps to a certain role.  Normally this will be entirely sufficient to distinguish principals.  However, you might have several login modules or security realms that can produce the same principal but with different meanings.  In this case you can include the login domain name or realm name to distinguish the principals.</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>Additional principal specifications</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;!-- normal, no domain or realm info --&gt;
 &lt;principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="user"/&gt;
 

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-session-manager-of-tomcat.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configuring-session-manager-of-tomcat.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configuring-session-manager-of-tomcat.html Mon May 21 13:00:07 2018
@@ -131,7 +131,7 @@ under the License.
 <p>You can customize the session management behaviour per web application context in your deployment plan as follows:</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Usage of StandardManger in geornimo-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;manager&gt;TomcatManager&lt;/manager&gt;
 &lt;gbean name="TomcatManager" class="org.apache.geronimo.tomcat.ManagerGBean"&gt;
@@ -144,7 +144,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>Usage of PersistentManger in geornimo-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;manager&gt;TomcatManager&lt;/manager&gt;
 &lt;gbean name="TomcatManager" class="org.apache.geronimo.tomcat.ManagerGBean"&gt;

Modified: websites/production/geronimo/content/GMOxDOC30/configuring-the-osgi-environment.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/configuring-the-osgi-environment.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/configuring-the-osgi-environment.html Mon May 21 13:00:07 2018
@@ -128,7 +128,7 @@ under the License.
 
 <ol><li>Open <code>config.properties</code> file under <code>/etc</code> directory.</li><li>Comment out the line with <strong>karaf.framework=equinox</strong> and uncomment the line with <strong>karaf.framework=felix</strong>.</li><li>Specify the location of Felix bundle using the key <strong>karaf.framework.felix</strong>. The following code snippet is an updated <code>config.properties</code> file.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>config.properties</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">
 ...
 #
 # Framework selection properties

Modified: websites/production/geronimo/content/GMOxDOC30/converting-applications-into-plugins-using-the-administration-console.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/converting-applications-into-plugins-using-the-administration-console.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/converting-applications-into-plugins-using-the-administration-console.html Mon May 21 13:00:07 2018
@@ -125,11 +125,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.rbtoc1523343445270 {padding: 0px;}
-div.rbtoc1523343445270 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343445270 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907375805 {padding: 0px;}
+div.rbtoc1526907375805 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907375805 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343445270">
+/*]]>*/</style><div class="toc-macro rbtoc1526907375805">
 <ul class="toc-indentation"><li><a shape="rect" href="#ConvertingapplicationsintopluginsusingtheAdministrationConsole-Convertingtheapplicationintoapluginviaconsole">Converting the application into a plugin via console</a></li><li><a shape="rect" href="#ConvertingapplicationsintopluginsusingtheAdministrationConsole-Exportingandimportingpluginsviaconsole">Exporting and importing plugins via console</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#ConvertingapplicationsintopluginsusingtheAdministrationConsole-Exportingtheapplicationasaplugin">Exporting the application as a plugin</a></li><li><a shape="rect" href="#ConvertingapplicationsintopluginsusingtheAdministrationConsole-CreateacustomrepositoryfromGeronimoAdministrativeConsole">Create a custom repository from Geronimo Administrative Console</a></li><li><a shape="rect" href="#ConvertingapplicationsintopluginsusingtheAdministrationConsole-Importingtheplugin">Importing the plugin</a></li></ul>
 </li></ul>
@@ -164,7 +164,7 @@ div.rbtoc1523343445270 li {margin-left:
 <h2 id="ConvertingapplicationsintopluginsusingtheAdministrationConsole-CreateacustomrepositoryfromGeronimoAdministrativeConsole">Create a custom repository from Geronimo Administrative Console</h2>
 <ol><li>Create a folder, for example <code>myplugins</code>, in your hard drive.</li><li>Copy the exported plugins to this directory.</li><li>Next create a geronimo-plugins.xml which will enlist all the plugins in our repository.
 <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-plugins.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" standalone="yes"?&gt;
 &lt;!--
     Licensed to the Apache Software Foundation (ASF) under one or more

Modified: websites/production/geronimo/content/GMOxDOC30/creating-deployment-plans-for-java-persistence-api.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/creating-deployment-plans-for-java-persistence-api.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/creating-deployment-plans-for-java-persistence-api.html Mon May 21 13:00:07 2018
@@ -124,11 +124,11 @@ under the License.
 
 <p>The document is organized as follows.</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343453536 {padding: 0px;}
-div.rbtoc1523343453536 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343453536 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907380121 {padding: 0px;}
+div.rbtoc1526907380121 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907380121 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343453536">
+/*]]>*/</style><div class="toc-macro rbtoc1526907380121">
 <ul class="toc-indentation"><li><a shape="rect" href="#CreatingdeploymentplansforJavaPersistenceAPI-JavaPersistenceAPI">Java Persistence API</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#CreatingdeploymentplansforJavaPersistenceAPI-ShareAccountsample">ShareAccount sample</a></li><li><a shape="rect" href="#CreatingdeploymentplansforJavaPersistenceAPI-Inheritancerelationshipinentities">Inheritance relationship in entities</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#CreatingdeploymentplansforJavaPersistenceAPI-Singledatabasetableperclasshierarchy">Single database table per class hierarchy</a></li></ul>
@@ -140,7 +140,7 @@ div.rbtoc1523343453536 li {margin-left:
 <p>This example illustrates developing an enterprise application that uses JPA for persistence. The database used is the embedded derby shipped with apache geronimo. Here, we present a persistence deployment descriptor (<code>persistence.xml</code>) that contains database connectivity and other information for the application. The <code>persistence.xml</code> is placed under META-INF/ directory of the application archive. The application contains an ejb module and a web module. EJB module uses a stateless session bean ShareHolderBean that uses JPA to perform database operations on the table SHAREACCOUNT in the ShareDB derby database. The SHAREACCOUNT table contains information about each shareholder along with the information regarding number shares he or she possesses currently in the account. The ShareHolderBean has methods that retrieve shareholder information, buy/sell shares of a particular shareholder, close the shareholder account etc. The web application has a servlet that l
 ooks up the ShareHolderBean and trigger the operations on it. The deployment descriptor information for the EJB module is provided using Java EE annotations in the respective bean classes. However, the persistence deployment descriptor information is provided using <code>META-INF/persistence.xml</code> file.</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.jpa.ShareAccount.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 sample.jpa;
 import java.io.Serializable;
 import javax.persistence.Entity;
@@ -250,7 +250,7 @@ public class ShareAccount implements Ser
 <p>The annotations placed around some of the methods of the ShareAccount class are @PrePersist, @PreUpdate, @PostUpdate and @PostLoad. These are the callback methods called by persistence container when corresponding database operations are performed on the entity.</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.jpa.ShareHolder.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 sample.jpa;
 import java.util.List;
 
@@ -269,7 +269,7 @@ public interface ShareHolder {
 <p>The <code>ShareHolder.java</code> is the remote interface of the 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>sample.jpa.ShareHolderBean.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 sample.jpa;
 import java.util.List;
 import javax.ejb.Stateless;
@@ -369,7 +369,7 @@ public class ShareHolderBean implements
 <p>The <code>ShareHolderBean.java</code> is the stateless session bean that uses JPA to perform database operations using ShareAccount entity.</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>Persistence.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;persistence xmlns="http://java.sun.com/xml/ns/persistence"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
@@ -403,7 +403,7 @@ public class ShareHolderBean implements
 <p>The default namespace of the above XML document is <a shape="rect" class="external-link" href="http://java.sun.com/xml/ns/persistence" rel="nofollow">http://java.sun.com/xml/ns/persistence</a>. The XML elements that do not have a namespace prefix belong to the default namespace.</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>sample.jpa.Test.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 sample.jpa;
 
 import java.io.IOException;
@@ -544,7 +544,7 @@ public class Test extends
 </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>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;!--
 The deployment descriptor of the web client.
 --&gt;
@@ -572,7 +572,7 @@ The deployment descriptor of the web cli
 </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>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;!--
 The geronimo deployment plan of the web client.
 --&gt;
@@ -673,7 +673,7 @@ ________________________________________
 <p>The below example illustrates the use this technique. The enterprise application has 3 entities and uses a single database table to store these entities. A stateless session bean uses JPA to perform DML operations on these entities. The web client looks up the SLSB trigger the operations.</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>Account</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 com.sample.jpa;
 
 import java.io.Serializable;
@@ -740,7 +740,7 @@ public abstract class Account
 <div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p><strong>@DiscriminatorColumn</strong> annotation designates table column to be used to discriminate rows that correspond to different entities in the class hierarchy.  @DiscriminatorValue annotation provides value that corresponds to the Account entity for the DiscriminatorColumn. The value is Account. Note that the Account entity class is declared as an abstract class. This is to prevent applications from instantiating Account objects. The intention is, to allow instantiating only sub entities SavingsAccount and CurrentAccount as given below. </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>SavingsAccount</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 com.sample.jpa;
 
 import javax.persistence.DiscriminatorColumn;
@@ -799,7 +799,7 @@ public class SavingsAccount extends Acco
 <div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body">
 <p><strong>@DiscriminatorValue</strong> annotation provides value that corresponds to the SavingsAccount entity for the DiscriminatorColumn. The value is SAVINGSACCOUNT</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>CurrentAccount</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 com.sample.jpa;
 
 import javax.persistence.DiscriminatorColumn;
@@ -859,7 +859,7 @@ public class CurrentAccount extends Acco
 <p><strong>@DiscriminatorValue</strong> annotation provides value that corresponds to the SavingsAccount entity for the DiscriminatorColumn. The value is CURRENTACCOUNT. <br clear="none">
 The CurrentAccount entity has currentAccountRules field and SavingsAccount has SavingsAccountRules field. Both inherit fields from the parent entity Account</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>AccessAccountStateless</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 com.sample.jpa;
 import java.util.List;
 public interface AccessAccountStateless {
@@ -893,7 +893,7 @@ public interface AccessAccountStateless
 </pre>
 </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>AccessAccountStatelessBean</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 com.sample.jpa;
 import java.util.ArrayList;
 import java.util.List;
@@ -1009,7 +1009,7 @@ public class AccessAccountStatelessBean
 </pre>
 </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>com.sample.jpa.Test</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 com.sample.jpa;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -1108,7 +1108,7 @@ public class Test extends
 </div></div>
 <p>The above servlet client only inserts entities in the table ACCOUNT. The code that deletes entities is commented out. We can write variety of clients that lookup the EJB and perform operations on the entities.</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>persistence.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;persistence 
@@ -1151,7 +1151,7 @@ public class Test extends
 
 <ul><li>Create an EAR application that contains an EJB application packaging all entity classes, ejb classes and META-INF/persistence.xml</li><li>Create META-INF/ejb-jar.xml. Since we have used annotations, we do not have to provide any declarations in it.</li><li>Create a WEB application in the EAR and add the above servlet.</li><li>Create a derby database by name AccountDB using admin console.</li><li>Create a table by name ACCOUNT as 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>ACCOUNT table</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 ACCOUNT(ACCOUNTNO integer, 
              ACCOUNTTYPE varchar(50), 
              NAME varchar(50), 

Modified: websites/production/geronimo/content/GMOxDOC30/creating-deployment-plans-for-web-applications.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/creating-deployment-plans-for-web-applications.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/creating-deployment-plans-for-web-applications.html Mon May 21 13:00:07 2018
@@ -123,11 +123,11 @@ In the <code>geronimo-web.xml</code> fil
 <p>The <code>geronimo-web.xml</code> uses XML elements from <a shape="rect" class="external-link" href="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1</a> namespace and one or more namespaces mentioned in <a shape="rect" href="configuring-resources-in-the-application-scope.html">Configuring resources in the application scope</a> section earlier in the document. </p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343453249 {padding: 0px;}
-div.rbtoc1523343453249 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343453249 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907380511 {padding: 0px;}
+div.rbtoc1526907380511 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907380511 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343453249">
+/*]]>*/</style><div class="toc-macro rbtoc1526907380511">
 <ul class="toc-indentation"><li><a shape="rect" href="#CreatingdeploymentplansforWebapplications-SampleplanforaWebapplication">Sample plan for a Web application</a></li><li><a shape="rect" href="#CreatingdeploymentplansforWebapplications-Containerspecificconfigurationinawebapplication">Container specific configuration in a web application</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#CreatingdeploymentplansforWebapplications-Thecontainer-configelement">The container-config element</a></li></ul>
 </li></ul>
@@ -138,7 +138,7 @@ div.rbtoc1523343453249 li {margin-left:
 <p>For example, the following <code>web.xml</code> and <code>geronimo-web.xml</code> are the deployment descriptor and Geronimo deployment plan respectively, of a web application that connects to a datasource deployed on DB2 and retrieves data from a table.</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>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;web-app xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -168,7 +168,7 @@ div.rbtoc1523343453249 li {margin-left:
 <p>In <code>geronimo-web.xml</code>, a &lt;dependency&gt; element is added to make the the resource archive (RAR) visible to your application, and then a mapping is provided in &lt;resource-ref&gt;.</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-2.0.1"
           xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
           xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
@@ -214,7 +214,7 @@ div.rbtoc1523343453249 li {margin-left:
 <p>In the <code>EMPdemo.jsp</code>, the following java code snippet is used to obtain a connection from the datasource. It reference the resource from the <code>java:comp/env</code> context entries.</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>EMPdemo.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">
 ....
 ....
 Context initContext = new InitialContext();
@@ -238,7 +238,7 @@ In some cases, you will need to provide
 <p>The <strong>&lt;container-config&gt;</strong> element is used to hold container specific Web application settings using the following format.  None of the Tomcat configuration elements are required, but if specified, they must follow the order in the example below.</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;container-config&gt;
     &lt;tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0"&gt;

Modified: websites/production/geronimo/content/GMOxDOC30/deploy.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/deploy.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/deploy.html Mon May 21 13:00:07 2018
@@ -388,14 +388,14 @@ Where <em>&lt;select&gt;</em> can be eit
 
 <p>Use this syntax to encrypt string <code>passw0rd</code> on an active server so that the encryption settings of that server will be used</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 --user myadmin --password mypassword encrypt passw0rd
 </pre>
 </div></div>
 
 <p>Online encryption result:</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 to encrypt: passw0rd
 Online encryption result:
@@ -408,14 +408,14 @@ GqfK0reVCpVwdAADQUVT
 
 <p>Use this syntax to encrypt string passw0rd offline</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 --offline encrypt passw0rd
 </pre>
 </div></div>
 
 <p>Offline encryption result:</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 to encrypt: passw0rd
 Offline encryption result:
@@ -495,7 +495,7 @@ GqfK0reVCpVwdAADQUVT
 
 <p>Note that before you can use the unlockKeystore command, you need to ensure that the following lines are added to &lt;geronimo_home&gt;/var/config/config-substitutions.properties:</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;keyStoreName&gt;=&lt;keyStoreEncryptedPassword&gt;
 &lt;keyAlias1&gt;=&lt;keyAlias1EncryptedPassword&gt;
 &lt;keyAlias2&gt;=&lt;keyAlias1EncryptedPassword&gt;
@@ -513,14 +513,14 @@ GqfK0reVCpVwdAADQUVT
 
 <p>Use this syntax to unlock the keystore whose name is mykeystore</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 --user myadmin --password mypassword unlockKeystore mykeystore
 </pre>
 </div></div>
 
 <p>Use this syntax to unlock the keystore whose name is mykeystore and the private key whose alias is key1</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 --user myadmin --password mypassword unlockKeystore mykeystore key1
 </pre>
 </div></div>

Modified: websites/production/geronimo/content/GMOxDOC30/deploying-and-running-ejb-application-clients.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/deploying-and-running-ejb-application-clients.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/deploying-and-running-ejb-application-clients.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.rbtoc1523343407139 {padding: 0px;}
-div.rbtoc1523343407139 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343407139 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907330945 {padding: 0px;}
+div.rbtoc1526907330945 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907330945 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343407139">
+/*]]>*/</style><div class="toc-macro rbtoc1526907330945">
 <ul class="toc-indentation"><li><a shape="rect" href="#DeployingandrunningEJBapplicationclients-SettingupEclipseIDEforEJBapplicationdevelopment">Setting up Eclipse IDE for EJB application development</a></li><li><a shape="rect" href="#DeployingandrunningEJBapplicationclients-DevelopingEJBlocalinterface,EJBremoteinterfaceandBeanclass">Developing EJB local interface, EJB remote interface and Bean class</a></li><li><a shape="rect" href="#DeployingandrunningEJBapplicationclients-DevelopingaJavaClient">Developing a Java Client</a></li><li><a shape="rect" href="#DeployingandrunningEJBapplicationclients-Deployandrun">Deploy and run</a></li></ul>
 </div>
 <p>Let us briefly understand this application. This application will take you through creating a simple Stateless Session EJB. Later we will develop a Java Application client to access this EJB. EJB development will make use of annotations which are introduced in Java EE5.</p>
@@ -157,7 +157,7 @@ div.rbtoc1523343407139 li {margin-left:
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline"></li><li>Add the following code as shown below
 <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>CountryCapital.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 javax.ejb.Remote;
@@ -171,7 +171,7 @@ Here <strong>@Remote</strong> is an anno
 <br clear="none" class="atl-forced-newline"></li><li>Similarly create a Local interface <em>CountryCapitalLocal</em>. Add the following code to the interface.
 <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>CountryCapitalLocal.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 javax.ejb.Local;
@@ -199,7 +199,7 @@ In the <strong>Remote</strong> as well a
 <br clear="none" class="atl-forced-newline"></li><li>Populate the bean class with the code as follows
 <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>CountryCapitalBean.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 javax.ejb.Stateless;
@@ -267,7 +267,7 @@ public class CountryCapitalBean implemen
 <br clear="none" class="atl-forced-newline"></li><li>Populate the <code>ApplicationClient.java</code> class with the following code:
 <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>ApplicationClient.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 appclient;
 
 import java.io.BufferedReader;
@@ -310,7 +310,7 @@ public class ApplicationClient {
 Let us try to understand following code snippet:
 <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>CodeSnippet</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">
 Properties prop=new Properties();
 prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
 prop.put("java.naming.provider.url", "ejbd://localhost:4201");
@@ -340,7 +340,7 @@ The above code suggests that which Initi
 
 <ol><li>Right click on the Geronimo server in the <em>Java EE perspective</em> and select <strong>Add and Remove Projects...</strong>.</li><li>There should be one deployable project in your workspace. Select <strong>Add All &gt;&gt;</strong> and then select <strong>Finish</strong>.</li><li>Once the deployment is successful open <code>&lt;GERONIMO_HOME&gt;/var/log/geronimo.log</code> and find 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>Snippet from geronimo.log after deployment of SimpleEJB</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">
 18:16:39,750 INFO  [startup] Jndi(name=CountryCapitalBeanLocal) --&gt; Ejb(deployment-id=SimpleEJB/CountryCapitalBean)
 18:16:39,750 INFO  [startup] Jndi(name=CountryCapitalBeanRemote) --&gt; Ejb(deployment-id=SimpleEJB/CountryCapitalBean)
 </pre>

Modified: websites/production/geronimo/content/GMOxDOC30/deploying-and-running-java-ee-application-client.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/deploying-and-running-java-ee-application-client.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/deploying-and-running-java-ee-application-client.html Mon May 21 13:00:07 2018
@@ -121,7 +121,7 @@ under the License.
 
 <ol><li>Create a client jar file for a simple example with these files. The client will write a message "CLIENT RUNNING..." on the Geronimo console: <code>client/MainClient.java</code>
 <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">
 package client;
 
 public class MainClient {
@@ -136,7 +136,7 @@ public class MainClient {
 </pre>
 </div></div></li><li>Create an application client deployment descriptor that provides the client display name: <code>META-INF/application-client.xml</code>
 <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;?xml version="1.0"?&gt;
 &lt;application-client xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee [http://java.sun.com/xml/ns/j2ee/applicationclient_1_4.xsd]" version="1.4"&gt;
@@ -145,7 +145,7 @@ public class MainClient {
 </pre>
 </div></div> </li><li>Create a Geronimo application client deployment plan that describes the deployment moduleId and types: <code>META-INF/geronimo-application-client.xml</code> You need to define two modules, one for client side and one for server side. <strong>EXAMPLEClientServer</strong> is the component that always its going to be running on the server, and  <strong>EXAMPLEClient</strong> is the component that you are going to run on the client from <code>client.jar</code>.
 <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;?xml version="1.0"?&gt;
 &lt;application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
     &lt;dep:client-environment&gt;

Modified: websites/production/geronimo/content/GMOxDOC30/deploying-and-undeploying-applications.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/deploying-and-undeploying-applications.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/deploying-and-undeploying-applications.html Mon May 21 13:00:07 2018
@@ -121,11 +121,11 @@ under the License.
 
 <p>There are several alternatives available for Deploying and undeploying applications:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343441185 {padding: 0px;}
-div.rbtoc1523343441185 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343441185 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907371536 {padding: 0px;}
+div.rbtoc1526907371536 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907371536 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343441185">
+/*]]>*/</style><div class="toc-macro rbtoc1526907371536">
 <ul class="toc-indentation"><li><a shape="rect" href="#Deployingandundeployingapplications-ViaGeronimoAdministrationConsoleGACdeploy">Via Geronimo Administration Console</a></li><li><a shape="rect" href="#Deployingandundeployingapplications-ViahotdeploymentHotdeploy">Via hot deployment</a></li><li><a shape="rect" href="#Deployingandundeployingapplications-ViaDeployertooldeployertool">Via Deployer tool</a></li><li><a shape="rect" href="#Deployingandundeployingapplications-Viagogocommandgogodeploy">Via gogo command</a></li><li><a shape="rect" href="#Deployingandundeployingapplications-ViaGEPGEPdeploy">Via GEP</a></li><li><a shape="rect" href="#Deployingandundeployingapplications-ViaClusteringWADIdeploy">Via Clustering</a></li></ul>
 </div>
 
@@ -167,7 +167,7 @@ div.rbtoc1523343441185 li {margin-left:
 <p>When you copy an application into the <code>deploy</code> directory, for example HelloWorld.war, you will see a confirmation message in the <code>geronimo.log</code>, which is located in the <code>&lt;geronimo_home&gt;/var/log</code> directory.</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">
 11:45:23,500 INFO  [DirectoryHotDeployer] Deploying HelloWorld.war
 11:45:23,953 INFO  [DirectoryHotDeployer] Deployed sample.applications/HelloWorldApp/1.0/war @ /hello
 </pre>
@@ -176,7 +176,7 @@ div.rbtoc1523343441185 li {margin-left:
 <p>To remove the application, delete the WAR or EAR file from the <code>deploy</code> directory. When the application has been removed, you should see a confirmation message in the <code>geronimo.log</code>, which is located in the <code>&lt;geronimo_home&gt;/var/log</code> directory.</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">
 11:46:17,953 INFO  [DirectoryHotDeployer] Undeploying HelloWorld.war
 11:46:18,281 INFO  [DirectoryMonitor] Hot deployer notified that an artifact was removed: sample.applications/HelloWorldApp/1.0/war
 11:46:18,281 INFO  [DirectoryHotDeployer]     Undeployed sample.applications/HelloWorldApp/1.0/war



Mime
View raw message