geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r946921 [9/11] - in /websites/production/geronimo/content: GMOxDOC30/ cache/
Date Thu, 09 Apr 2015 18:54:54 GMT
Modified: websites/production/geronimo/content/GMOxDOC30/jms-resources-deployment.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/jms-resources-deployment.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/jms-resources-deployment.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="how-to-access-resources-via-jndi.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="how-to-access-resources-via-jndi.html">How to Access Resources via JNDI</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="questionable-doc-pages.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="questionable-doc-pages.html">Questionable Doc Pages</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="how-to-access-resources-via-jndi.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="how-to-access-resources-via-jndi.html">How to Access Resources via JNDI</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="questionable-doc-pages.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="questionable-doc-pages.html">Questionable Doc Pages</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 <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">

Modified: websites/production/geronimo/content/GMOxDOC30/ldap-realm.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/ldap-realm.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/ldap-realm.html Thu Apr  9 18:54:52 2015
@@ -124,18 +124,18 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="database-sql-realm.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="database-sql-realm.html">Database (SQL) Realm</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="administering-security-realms.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="administering-security-realms.html">Administering security realms</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="properties-file-realm.html">Properties File Realm</a></td><td colspan="1" rowspan="1" class="Scrollbar
 NextIcon"><a shape="rect" href="properties-file-realm.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="database-sql-realm.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="database-sql-realm.html">Database (SQL) Realm</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="administering-security-realms.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="administering-security-realms.html">Administering security realms</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="properties-file-realm.html">Properties File Realm</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="properties-file-
 realm.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <p>This document covers some of the alternatives for configuring LDAP Realms in Apache Geronimo v2.1. In previous version of Apache Geronimo, ApacheDS was shipped along with Geronimo.  To reduce the server footprint and exploit the Geronimo plugin architecture the LDAP server is currently available as an optional plugin install rather then being bundled with the Geronimo server for 2.1. Having said this, ApacheDS is not a requirement for configuring an LDAP Realm.  However it will be practical for the purposes of this document to use a local LDAP server.</p>
 
 <p>This document is organized in the following sections:</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1413831484736 {padding: 0px;}
-div.rbtoc1413831484736 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413831484736 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605596433 {padding: 0px;}
+div.rbtoc1428605596433 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1428605596433 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1413831484736">
+/*]]>*/</style><div class="toc-macro rbtoc1428605596433">
 <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>

Modified: websites/production/geronimo/content/GMOxDOC30/ldap-sample-app-ldap-sample-application.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/ldap-sample-app-ldap-sample-application.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/ldap-sample-app-ldap-sample-application.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="jarresource-javaee6-a-simple-bundled-resources-example.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="jarresource-javaee6-a-simple-bundled-resources-example.html">jarresource-javaee6 - A simple bundled resources example</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="java-ee-sample-applications.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="java-ee-sample-applications.html">Java EE sample applications</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="
 not-in-svn-inbound-jca-example.html">not-in-svn - Inbound JCA example</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="not-in-svn-inbound-jca-example.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="jarresource-javaee6-a-simple-bundled-resources-example.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="jarresource-javaee6-a-simple-bundled-resources-example.html">jarresource-javaee6 - A simple bundled resources example</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="java-ee-sample-applications.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="java-ee-sample-applications.html">Java EE sample applications</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="not-in-svn-inbound-jca-example.html">not-in-svn 
 - Inbound JCA example</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="not-in-svn-inbound-jca-example.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 <p><span class="confluence-anchor-link" id="ldap-sample-app-LDAPSampleApplication-top"></span></p>
 
 <p>This sample shows how you can use a Lightweight Directory Access Protocol (LDAP) server to configure and control access to resources on your Geronimo server.</p>
@@ -162,11 +162,11 @@ Created to eliminate cyclic project depe
 
 <p>This article is organized in the following sections:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1413831476887 {padding: 0px;}
-div.rbtoc1413831476887 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413831476887 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605584827 {padding: 0px;}
+div.rbtoc1428605584827 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1428605584827 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1413831476887">
+/*]]>*/</style><div class="toc-macro rbtoc1428605584827">
 <ul class="toc-indentation"><li><a shape="rect" href="#ldap-sample-app-LDAPSampleApplication-StartingtheLDAPserver">Starting the LDAP server</a></li><li><a shape="rect" href="#ldap-sample-app-LDAPSampleApplication-SourceCodeforSample">Source Code for Sample</a></li><li><a shape="rect" href="#ldap-sample-app-LDAPSampleApplication-AddLDAPentries">Add LDAP entries</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#ldap-sample-app-LDAPSampleApplication-Toaddentriesmanually">To add entries manually</a></li><li><a shape="rect" href="#ldap-sample-app-LDAPSampleApplication-ToaddentriesusinganLDAPclient">To add entries using an LDAP client</a></li></ul>
 </li><li><a shape="rect" href="#ldap-sample-app-LDAPSampleApplication-DeploytheLDAPrealm">Deploy the LDAP realm</a>
@@ -599,19 +599,19 @@ Using JRE_HOME:        C:\Java\jdk1.5.0_
 
 <p>The following figure shows the welcome page for the LDAP sample application.</p>
 
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645372/ldap_1.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2" data-image-src="/confluence/download/attachments/20645372/ldap_1.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
+<p><img class="confluence-embedded-image" src="ldap-sample-app-ldap-sample-application.data/ldap_1.jpg" data-image-src="/confluence/download/attachments/20645372/ldap_1.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
 
 <p>Click on <a shape="rect" class="external-link" href="http://localhost:8080/LDAP_Sample/protect/" rel="nofollow">Protect</a> to validate against the LDAP Directory Server.</p>
 
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645372/ldap_2.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2" data-image-src="/confluence/download/attachments/20645372/ldap_2.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
+<p><img class="confluence-embedded-image" src="ldap-sample-app-ldap-sample-application.data/ldap_2.jpg" data-image-src="/confluence/download/attachments/20645372/ldap_2.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
 
 <p>Enter <strong>system</strong> as the username and <strong>manager</strong> as the password and click <strong>Login</strong>. The username and password you provide here is the same you use to access the Geronimo Web console and it is stored in the Directory Server database. Once you are logged in you should see the following screen.</p>
 
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645372/ldap_3.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2" data-image-src="/confluence/download/attachments/20645372/ldap_3.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
+<p><img class="confluence-embedded-image" src="ldap-sample-app-ldap-sample-application.data/ldap_3.jpg" data-image-src="/confluence/download/attachments/20645372/ldap_3.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
 
 <p>At this point you have an application that is validating username and passwords against an LDAP Directory Server database based on the security configuration you provided earlier in the LDAP realm. Now, if you go back to the welcome page and click on <a shape="rect" class="external-link" href="http://localhost:8080/LDAP_Sample/forbidden/" rel="nofollow">Forbidden</a> you should receive a 403 - Forbidden HTTP error similar to the one shown in the following figure.</p>
 
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645372/ldap_4.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2" data-image-src="/confluence/download/attachments/20645372/ldap_4.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
+<p><img class="confluence-embedded-image" src="ldap-sample-app-ldap-sample-application.data/ldap_4.jpg" data-image-src="/confluence/download/attachments/20645372/ldap_4.jpg?version=1&amp;modificationDate=1204530490000&amp;api=v2"></p>
 
 <p>Depending on the web container you are using (that is Jetty or Tomcat) the presentation of that screen may be slightly different.</p>
 

Modified: websites/production/geronimo/content/GMOxDOC30/locating-your-application-specific-configuration-files.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/locating-your-application-specific-configuration-files.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/locating-your-application-specific-configuration-files.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="getting-familiar-with-geronimo-eclipse-plugin-gep.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="getting-familiar-with-geronimo-eclipse-plugin-gep.html">Getting familiar with Geronimo Eclipse Plugin (GEP)</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="getting-familiar-with-the-development-environment.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="getting-familiar-with-the-development-environment.html">Getting familiar with the development environment</a></td><td colspan="1" rowspan="1" class="Scrollba
 rNextName" width="33%">&#160;<a shape="rect" href="quick-debugging-jsps-of-your-application.html">Quick Debugging JSPs of your application</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="quick-debugging-jsps-of-your-application.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="getting-familiar-with-geronimo-eclipse-plugin-gep.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="getting-familiar-with-geronimo-eclipse-plugin-gep.html">Getting familiar with Geronimo Eclipse Plugin (GEP)</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="getting-familiar-with-the-development-environment.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="getting-familiar-with-the-development-environment.html">Getting familiar with the development environment</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" hre
 f="quick-debugging-jsps-of-your-application.html">Quick Debugging JSPs of your application</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="quick-debugging-jsps-of-your-application.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 <p>Many applications have configuration files that are intended to be customized by the user and need to be in an easily accessible location.  Geronimo is designed so you can create an application specific configuration directory under the <code>var</code> directory for this purpose.  There are several ways for your application to locate this directory and the files in it.  If you deploy your application as a Geronimo plugin you can specify that the original of these files be unpacked from your application plugin when it is installed.</p>
 
 <p>See also the discussion of the system and server locations relevant to <a shape="rect" href="running-multiple-geronimo-instances.html">running multiple instances from one installation</a>.</p>

Modified: websites/production/geronimo/content/GMOxDOC30/managing-osgi-bundles.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/managing-osgi-bundles.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/managing-osgi-bundles.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="deploying-and-administering-plugins.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="deploying-and-administering-plugins.html">Deploying and administering plugins</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="deploying-and-administering-assets-in-geronimo.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="deploying-and-administering-assets-in-geronimo.html">Deploying and administering assets in Geronimo</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="deploying-and-administering-plugins.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="deploying-and-administering-plugins.html">Deploying and administering plugins</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="deploying-and-administering-assets-in-geronimo.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="deploying-and-administering-assets-in-geronimo.html">Deploying and administering assets in Geronimo</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 
 
 <p>You can use the OSGI Bundles portlet to install and manage bundles. On the administration console, select the <strong>OSGI Bundles</strong> portlet in the <strong>Resources</strong> folder from the left navigation panel to access the portlet.</p>
@@ -132,11 +132,11 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>This document is organized into the following sections:</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1413831491981 {padding: 0px;}
-div.rbtoc1413831491981 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413831491981 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605604773 {padding: 0px;}
+div.rbtoc1428605604773 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1428605604773 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1413831491981">
+/*]]>*/</style><div class="toc-macro rbtoc1428605604773">
 <ul class="toc-indentation"><li><a shape="rect" href="#ManagingOSGiBundles-InstallinganOSGiBundle">Installing an OSGi Bundle</a></li><li><a shape="rect" href="#ManagingOSGiBundles-ManagingtheStatusofOSGiBundles">Managing the Status of OSGi Bundles</a></li><li><a shape="rect" href="#ManagingOSGiBundles-ViewingDifferentGroupsofBundles">Viewing Different Groups of Bundles</a></li><li><a shape="rect" href="#ManagingOSGiBundles-ViewingthePackageofOSGiBundles">Viewing the Package of OSGi Bundles</a></li><li><a shape="rect" href="#ManagingOSGiBundles-ViewingtheInformationofOSGiBundles">Viewing the Information of OSGi Bundles</a></li></ul>
 </div>
 

Modified: websites/production/geronimo/content/GMOxDOC30/managing-valve.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/managing-valve.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/managing-valve.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="configuring-virtual-host.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="configuring-virtual-host.html">Configuring virtual host</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="configuring-the-web-container.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="configuring-the-web-container.html">Configuring the Web Container</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="configuring-virtual-host.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="configuring-virtual-host.html">Configuring virtual host</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="configuring-the-web-container.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="configuring-the-web-container.html">Configuring the Web Container</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 <p>In Tomcat, a <em>valve</em> is a Java class that can be inserted into the request processing pipeline.  A valve executes as part of Tomcat's servlet container and is independent of the Web application. Valves run in a chain where the last link in the chain is the Web application itself. Each valve performs its request processing, calls the next valve in the chain, performs its response processing, and returns to the valve that called it. See the <a shape="rect" class="external-link" href="http://tomcat.apache.org/tomcat-6.0-doc/config/valve.html" title="The Valve Component">Tomcat valve component</a> for more information on the valves provided in the Tomcat library.</p>
 
 <p>Currently, the valve cannot be configured by using the administration console. Tomcat valves are initially defined in the <code>&lt;geronimo_home&gt;/repository/org/apache/geronimo/configs/tomcat6/2.2/tomcat6-2.2.car/META-INF/plan.xml</code> file. To change valves configuration, you must modify <code>&lt;Geronimo_home&gt;/var/config/<a shape="rect" href="configxml.html">config.xml</a></code>.</p>
@@ -132,11 +132,11 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>The following sections illustrate common changes that you might want to make to your valve chain.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1413831484200 {padding: 0px;}
-div.rbtoc1413831484200 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413831484200 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605595011 {padding: 0px;}
+div.rbtoc1428605595011 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1428605595011 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1413831484200">
+/*]]>*/</style><div class="toc-macro rbtoc1428605595011">
 <ul class="toc-indentation"><li><a shape="rect" href="#ManagingValve-DisabletheAccessLogValve">Disable the Access Log Valve</a></li><li><a shape="rect" href="#ManagingValve-AddasecondValve">Add a second Valve</a></li><li><a shape="rect" href="#ManagingValve-Configureavalvechain">Configure a valve chain</a></li></ul>
 </div>
 

Modified: websites/production/geronimo/content/GMOxDOC30/migrating-from-jax-rpc-to-jax-ws.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/migrating-from-jax-rpc-to-jax-ws.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/migrating-from-jax-rpc-to-jax-ws.html Thu Apr  9 18:54:52 2015
@@ -124,17 +124,17 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="developing-mtom-web-services.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="developing-mtom-web-services.html">Developing MTOM Web Services</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="developing-web-services.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="developing-web-services.html">Developing Web services</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="restful-web-services.html">RESTful Web Services</a></td><td colspan="1" rowspan="1" class="S
 crollbarNextIcon"><a shape="rect" href="restful-web-services.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="developing-mtom-web-services.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="developing-mtom-web-services.html">Developing MTOM Web Services</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="developing-web-services.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="developing-web-services.html">Developing Web services</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="restful-web-services.html">RESTful Web Services</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="restful-
 web-services.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 <p>This tutorial will take you through the steps that are most commonly involved in porting a Web Service from JAX-RPC to JAX-WS. This tutorial does not go into details on why these changes are required and the concepts behind it; it is rather a quick note that helps you to deal with migrating your application from the older Web service stack to new stack.</p>
 
 <p>Even though JAX-RPC is still supported in Java EE 5, it lacks many advanced features that JAX-WS has like Annotations, JAXB Binding, SOAP 1.2, RESTful Services and so on. So, it is strongly recommended that you use JAX-WS instead of JAX-RPC for implementing Web Services in Java.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1413831477918 {padding: 0px;}
-div.rbtoc1413831477918 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413831477918 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605587941 {padding: 0px;}
+div.rbtoc1428605587941 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1428605587941 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1413831477918">
+/*]]>*/</style><div class="toc-macro rbtoc1428605587941">
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-JAXBmigration">JAXB migration</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-Annotations">Annotations</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-SOAPstandards">SOAP standards</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-ServiceEndpointInterfacerequirements">Service Endpoint Interface requirements</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-Deploymentdescriptor">Deployment descriptor</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-Clientportlookup">Client port lookup</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-RESTfulservices">RESTful services</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-Provider">Provider</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-Dispatch">Dispatch</a></li></ul>
 </li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-Asynchronousoperations">Asynchronous operations</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-MTOMandSAAJ">MTOM and SAAJ</a></li><li><a shape="rect" href="#MigratingfromJAX-RPCtoJAX-WS-References">References</a></li></ul>

Modified: websites/production/geronimo/content/GMOxDOC30/migrating-from-tomcat-to-geronimo.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/migrating-from-tomcat-to-geronimo.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/migrating-from-tomcat-to-geronimo.html Thu Apr  9 18:54:52 2015
@@ -124,14 +124,14 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="migrating-from-jboss-to-geronimo.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="migrating-from-jboss-to-geronimo.html">Migrating from JBoss to Geronimo</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="migrating-to-apache-geronimo.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="migrating-to-apache-geronimo.html">Migrating to Apache Geronimo</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="migrating-from-jboss-to-geronimo.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="migrating-from-jboss-to-geronimo.html">Migrating from JBoss to Geronimo</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="migrating-to-apache-geronimo.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="migrating-to-apache-geronimo.html">Migrating to Apache Geronimo</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 <p>Tomcat is a Web Container available with Apache product family. It implements Java Servlet 3.0 API and Java Server Pages (JSP) 2.2 API. Apache Geronimo is a Java EE6 Web profile certified application server with Apache Tomcat, Apache OpenEJB pre-integrated. As a result, while working with Geronimo you will be working with same Tomcat engine as the standalone version of Tomcat. However there are some differences which we will discuss in upcoming sections</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1413831481519 {padding: 0px;}
-div.rbtoc1413831481519 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413831481519 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605591076 {padding: 0px;}
+div.rbtoc1428605591076 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1428605591076 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1413831481519">
+/*]]>*/</style><div class="toc-macro rbtoc1428605591076">
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-ImplementationAnalysis">Implementation Analysis</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-BestPractices">Best Practices</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-Tomcatonlyapplication">Tomcat only application</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-TomcatandApacheDerby">Tomcat and Apache Derby</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-TomcatandApacheAXIS">Tomcat and Apache AXIS</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-TomcatandApacheActiveMQ">Tomcat and Apache ActiveMQ</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-Configurationsinserver.xml">Configurations in server.xml</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-Removeunneededjars">Remove unneeded jars</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-DoNotwanttoremovejars">Do Not want to remove jars</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-JSPReloading">JSP Reloading</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-PersistJSPCompilation">Pers
 ist JSP Compilation</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-Serverscoped">Server scoped</a></li><li><a shape="rect" href="#MigratingfromTomcattoGeronimo-Applicationscoped">Application scoped</a></li></ul>

Modified: websites/production/geronimo/content/GMOxDOC30/migrating-with-the-j2g-migration-tool.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/migrating-with-the-j2g-migration-tool.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/migrating-with-the-j2g-migration-tool.html Thu Apr  9 18:54:52 2015
@@ -126,11 +126,11 @@ table.ScrollbarTable td.ScrollbarNextIco
 
 /*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="jboss-to-geronimo-servlets-and-jsps-migration.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="jboss-to-geronimo-servlets-and-jsps-migration.html">JBoss to Geronimo - Servlets and JSPs Migration</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="migrating-from-jboss-to-geronimo.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="migrating-from-jboss-to-geronimo.html">Migrating from JBoss to Geronimo</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1427893114425 {padding: 0px;}
-div.rbtoc1427893114425 ul {list-style: disc;margin-left: 0px;padding-left: 20px;}
-div.rbtoc1427893114425 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605551452 {padding: 0px;}
+div.rbtoc1428605551452 ul {list-style: disc;margin-left: 0px;padding-left: 20px;}
+div.rbtoc1428605551452 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1427893114425">
+/*]]>*/</style><div class="toc-macro rbtoc1428605551452">
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingwiththeJ2GMigrationTool-Overview">Overview</a></li><li><a shape="rect" href="#MigratingwiththeJ2GMigrationTool-Downloading">Downloading</a></li><li><a shape="rect" href="#MigratingwiththeJ2GMigrationTool-Components">Components</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingwiththeJ2GMigrationTool-Dependencies">Dependencies</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#MigratingwiththeJ2GMigrationTool-EnvironmentVariables">Environment Variables</a></li></ul>

Modified: websites/production/geronimo/content/GMOxDOC30/monitoring-components-on-geronimo-server.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/monitoring-components-on-geronimo-server.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/monitoring-components-on-geronimo-server.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="displaying-jvm-information.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="displaying-jvm-information.html">Displaying JVM information</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html">Monitoring the health of the Apache Geronimo server</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="monitoring-thr
 ead-pools.html">Monitoring thread pools</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="monitoring-thread-pools.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="displaying-jvm-information.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="displaying-jvm-information.html">Displaying JVM information</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html">Monitoring the health of the Apache Geronimo server</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="monitoring-thread-pools.html">Monitoring thread pools</a></td>
 <td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="monitoring-thread-pools.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <p>The Geronimo monitoring plug-in is broken down between server and client plug-ins, referred to as the 'Agent' and 'Console' respectively. When properly setup, these plug-ins provide both local and remote real-time JSR77 compliant statistic monitoring, as well as historical tracking of any exposed statistic with visual representations drawn in the form of graphs through the Dojo Toolkit's dojoX Charting packages.</p>
 
@@ -182,11 +182,11 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>In this example, we attempt to determine if there is a correlation between the server JVM heap space and the web containers number of bytes downloaded. In other words, this monitoring session will show if the server is releasing heap memory after client downloads.</p>
 
 <p>First, select the <strong>Monitoring</strong> link on the <strong>Console Navigation</strong> menu. If this is your first monitoring session, you should see an empty set of Servers, Views, and Graphs as shown in this figure.<br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645348/consoleMonitoringStart.png?version=1&amp;modificationDate=1203498273000&amp;api=v2" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringStart.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
+<img class="confluence-embedded-image" src="monitoring-components-on-geronimo-server.data/consoleMonitoringStart.png" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringStart.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
 
 <h4 id="MonitoringcomponentsonGeronimoServer-AddingaServer">Adding a Server</h4>
 <p>Select a server to monitor by providing a host name or IP address. Select the protocol for communication and any security credentials. Save this server definition by pressing <strong>Save</strong>.<br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645348/consoleMonitoringServerAdd.png?version=1&amp;modificationDate=1203498273000&amp;api=v2" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringServerAdd.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
+<img class="confluence-embedded-image" src="monitoring-components-on-geronimo-server.data/consoleMonitoringServerAdd.png" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringServerAdd.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
 
 <p>Fill in the fields, and click <strong>Add</strong>. For example:</p>
 <ol><li>Name=GeronimoServer</li><li>IP/Hostname=localhost</li><li>Protocol=[default=EJB]</li><li>Port=[default=4201]</li><li>Username=system</li><li>Password=manager</li><li>Password(verify)=manager</li></ol>
@@ -203,23 +203,23 @@ Alternatively, it is possible to test th
 <h4 id="MonitoringcomponentsonGeronimoServer-AddingaGraph">Adding a Graph</h4>
 
 <p>Select information to display by adding a graph. Select the server you are monitoring, and then choose an MBean that publishes server information by choosing an MBean from the MBean drop down control. Once you have selected an MBean, you can see what information is available by selecting data from the Data series drop down control. When you have described the data, save this graph by pressing <strong>Save</strong>.<br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645348/consoleMonitoringGraphAddJVM.png?version=1&amp;modificationDate=1203498273000&amp;api=v2" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringGraphAddJVM.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
+<img class="confluence-embedded-image" src="monitoring-components-on-geronimo-server.data/consoleMonitoringGraphAddJVM.png" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringGraphAddJVM.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
 
 <p>Select more information to display by adding a second graph. As the two data series scroll in time, we will be able to detect any correlation between the data. Once again, choose a server and an MBean to monitor. Select data from the Data series drop down control. Since data sent increases over time, also select <strong>delta</strong> for the Data series, so we see the rise and fall of the data over time. Save this graph by pressing <strong>Save</strong>.<br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645348/consoleMonitoringGraphAddBytes.png?version=1&amp;modificationDate=1203498273000&amp;api=v2" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringGraphAddBytes.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
+<img class="confluence-embedded-image" src="monitoring-components-on-geronimo-server.data/consoleMonitoringGraphAddBytes.png" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringGraphAddBytes.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
 
 <p>After the graph is added, the browser is redirected to the main monitoring console page, where selecting the name of the graph will open a window that displays the graph.</p>
 
 <h4 id="MonitoringcomponentsonGeronimoServer-AddingaView">Adding a View</h4>
 <p>Now group one or more graphs into a view. Here we add a view for "JVM vs Bytes Sent" by selecting two of the graphs we created in earlier steps. Save the view by pressing <strong>Save</strong>.<br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645348/consoleMonitoringViewAdd.png?version=1&amp;modificationDate=1203498273000&amp;api=v2" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringViewAdd.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
+<img class="confluence-embedded-image" src="monitoring-components-on-geronimo-server.data/consoleMonitoringViewAdd.png" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringViewAdd.png?version=1&amp;modificationDate=1203498273000&amp;api=v2"></p>
 
 <p>This figure shows the console monitoring portlet after we have added the server, graphs, and views.<br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645348/consoleMonitoringReady.png?version=1&amp;modificationDate=1203498294000&amp;api=v2" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringReady.png?version=1&amp;modificationDate=1203498294000&amp;api=v2"></p>
+<img class="confluence-embedded-image" src="monitoring-components-on-geronimo-server.data/consoleMonitoringReady.png" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringReady.png?version=1&amp;modificationDate=1203498294000&amp;api=v2"></p>
 
 <h4 id="MonitoringcomponentsonGeronimoServer-TheMonitoringGraphView">The Monitoring Graph View</h4>
 <p>Click on a view to start monitoring server information over time. This view shows the JVM heap and web server bytes sent over a one hour period. As you see in the example, the JVM heap memory goes up and down over time with little correlation to the number of bytes users request from the web server. <br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645348/consoleMonitoringView.png?version=1&amp;modificationDate=1203498294000&amp;api=v2" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringView.png?version=1&amp;modificationDate=1203498294000&amp;api=v2"></p></div>
+<img class="confluence-embedded-image" src="monitoring-components-on-geronimo-server.data/consoleMonitoringView.png" data-image-src="/confluence/download/attachments/20645348/consoleMonitoringView.png?version=1&amp;modificationDate=1203498294000&amp;api=v2"></p></div>
         </div>
 
                   <div class="tabletitle">

Modified: websites/production/geronimo/content/GMOxDOC30/monitoring-the-health-of-the-apache-geronimo-server.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/monitoring-the-health-of-the-apache-geronimo-server.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/monitoring-the-health-of-the-apache-geronimo-server.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="introducing-geronimo-administration-console.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="introducing-geronimo-administration-console.html">Introducing Geronimo Administration Console</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="configuring-and-administering.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="configuring-and-administering.html">Configuring and administering</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="introducing-geronimo-administration-console.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="introducing-geronimo-administration-console.html">Introducing Geronimo Administration Console</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="configuring-and-administering.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="configuring-and-administering.html">Configuring and administering</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 
 <p>This topic is about how to monitor resources usage and status of Geronimo server.</p>
 

Modified: websites/production/geronimo/content/GMOxDOC30/monitoring-the-server-with-predefined-graphs-and-views.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/monitoring-the-server-with-predefined-graphs-and-views.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/monitoring-the-server-with-predefined-graphs-and-views.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="configuring-your-own-monitoring-plugin-datasource.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="configuring-your-own-monitoring-plugin-datasource.html">Configuring your own Monitoring Plugin DataSource</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="monitoring-components-on-geronimo-server.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="monitoring-components-on-geronimo-server.html">Monitoring components on Geronimo Server</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;
 </td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="configuring-your-own-monitoring-plugin-datasource.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="configuring-your-own-monitoring-plugin-datasource.html">Configuring your own Monitoring Plugin DataSource</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="monitoring-components-on-geronimo-server.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="monitoring-components-on-geronimo-server.html">Monitoring components on Geronimo Server</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 
 <p>In Geronimo, a set of predefined <a shape="rect" href="#Monitoringtheserverwithpredefinedgraphsandviews-predefinedgraph">graphs</a> and <a shape="rect" href="#Monitoringtheserverwithpredefinedgraphsandviews-predefinedview">views</a> are provided for server monitoring, and a new account <strong>monitor</strong> is added with the authority only to view the graphs and views that are defined for server monitoring. </p>
 

Modified: websites/production/geronimo/content/GMOxDOC30/monitoring-thread-pools.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/monitoring-thread-pools.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/monitoring-thread-pools.html Thu Apr  9 18:54:52 2015
@@ -124,9 +124,9 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="monitoring-components-on-geronimo-server.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="monitoring-components-on-geronimo-server.html">Monitoring components on Geronimo Server</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html">Monitoring the health of the Apache Geronimo server</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">
 &#160;<a shape="rect" href="server-uptime-and-resource-utilization.html">Server uptime and resource utilization</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="server-uptime-and-resource-utilization.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="monitoring-components-on-geronimo-server.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="monitoring-components-on-geronimo-server.html">Monitoring components on Geronimo Server</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="monitoring-the-health-of-the-apache-geronimo-server.html">Monitoring the health of the Apache Geronimo server</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="server-uptime-and-re
 source-utilization.html">Server uptime and resource utilization</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="server-uptime-and-resource-utilization.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 <p>The <strong>Thread Pools</strong> portlet provides information about threads being used by the Geronimo server. <br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/20645358/threads.PNG?version=1&amp;modificationDate=1238356220000&amp;api=v2" data-image-src="/confluence/download/attachments/20645358/threads.PNG?version=1&amp;modificationDate=1238356220000&amp;api=v2"><br clear="none">
+<img class="confluence-embedded-image" src="monitoring-thread-pools.data/threads.PNG" data-image-src="/confluence/download/attachments/20645358/threads.PNG?version=1&amp;modificationDate=1238356220000&amp;api=v2"><br clear="none">
 You can click <strong>Monitor</strong> to see statistics about maximum threads in the pool, lowest number recorded, highest number recorded, and threads in use for <strong>ConnectorThreadPool</strong> and <strong>DefaultThreadPool</strong>.</p>
 
 <ul><li><strong>DefaultThreadPool</strong> size denotes the maximum number of threads possible in the server.</li><li><strong>ConnectorThreadPool</strong> size denotes the pool size of the connector threads and is a subset of DefaultThreadPool size.</li></ul>

Modified: websites/production/geronimo/content/GMOxDOC30/not-in-svn-inbound-jca-example.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/not-in-svn-inbound-jca-example.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/not-in-svn-inbound-jca-example.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="ldap-sample-app-ldap-sample-application.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="ldap-sample-app-ldap-sample-application.html">ldap-sample-app - LDAP Sample Application</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="java-ee-sample-applications.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="java-ee-sample-applications.html">Java EE sample applications</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="restfulorder-javaee6-simple-web-service-with-
 jax-rs.html">restfulorder-javaee6 - Simple Web Service with JAX-RS</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="restfulorder-javaee6-simple-web-service-with-jax-rs.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="ldap-sample-app-ldap-sample-application.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="ldap-sample-app-ldap-sample-application.html">ldap-sample-app - LDAP Sample Application</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="java-ee-sample-applications.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="java-ee-sample-applications.html">Java EE sample applications</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="restfulorder-javaee6-simple-web-service-with-jax-rs.html">restfulorder-javaee6 - Simple Web S
 ervice with JAX-RS</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="restfulorder-javaee6-simple-web-service-with-jax-rs.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 <p><span class="confluence-anchor-link" id="not-in-svn-InboundJCAexample-top"></span><br clear="none">
 The J2EE Connector Architecture (JCA) provides a Java technology solution to the problem of connectivity between the many application containers and today's enterprise information systems (EIS). In the 1.5 release of the JCA specification, the architecture defines an inbound communication model, whereby the EIS initiates all communication to an EJB application. The mechanism allows the inbound resource adapters to invoke Enterprise Java Beans (EJB).</p>
 

Modified: websites/production/geronimo/content/GMOxDOC30/obscuring-passwords.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/obscuring-passwords.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/obscuring-passwords.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%">&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="administering-users-and-groups.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="administering-users-and-groups.html">Administering users and groups</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%">&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="administering-users-and-groups.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="administering-users-and-groups.html">Administering users and groups</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
 <p>By default, Geronimo uses AES to encode login passwords. When the server starts or when a login module starts, any unobscured password is replaced by<br clear="none">
 {<code>Simple}&lt;encrypted password&gt;</code><br clear="none">
 This prevents someone from verbatim copying a password out of the <code>users.properties</code> file, and keeps your passwords available (the key is in svn even if you lose it locally) but of course anyone can look up the key and decode the password.</p>

Modified: websites/production/geronimo/content/GMOxDOC30/openejb-jarxml.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/openejb-jarxml.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/openejb-jarxml.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="geronimo-webxml.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="geronimo-webxml.html">geronimo-web.xml</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="understanding-deployment-plans.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="understanding-deployment-plans.html">Understanding deployment plans</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="persistencexml.html">persistence.xml</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="
 rect" href="persistencexml.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="geronimo-webxml.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="geronimo-webxml.html">geronimo-web.xml</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="understanding-deployment-plans.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="understanding-deployment-plans.html">Understanding deployment plans</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="persistencexml.html">persistence.xml</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="persistencexml.html"><img align="mid
 dle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <h1 id="openejb-jar.xml-Overview">Overview</h1>
 <p>Geronimo uses the OpenEJB container for providing EJB services. With the advent of Java EE, the EJB container services such as transaction management, security, life cycle management can be declared in the EJB class itself using annotations. However, the EJB deployment descriptor can still be provided via usage of the <strong>ejb-jar.xml</strong> file. When both annotations and the <strong>ejb-jar.xml</strong> file are provided, the <strong>ejb-jar.xml</strong> file takes precedence over the annotations.</p>

Modified: websites/production/geronimo/content/GMOxDOC30/plugin-and-plugins-group.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/plugin-and-plugins-group.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/plugin-and-plugins-group.html Thu Apr  9 18:54:52 2015
@@ -124,16 +124,16 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="geronimo-modules.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="geronimo-modules.html">Geronimo Modules</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="geronimo-architecture.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="geronimo-architecture.html">Geronimo Architecture</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="plugin-group.html">Plugin Group</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="plugin-group.html"
 ><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="geronimo-modules.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="geronimo-modules.html">Geronimo Modules</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="geronimo-architecture.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="geronimo-architecture.html">Geronimo Architecture</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="plugin-group.html">Plugin Group</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="plugin-group.html"><img align="middle" border="0" src="/images/con
 fluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <p>Apache Geronimo is now assembled completely out of plugins including the server configuration files, in this section we will explain the overview of plugin system and introduce concept of plugin groups betaken starting from v2.2.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1413831485822 {padding: 0px;}
-div.rbtoc1413831485822 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1413831485822 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1428605597247 {padding: 0px;}
+div.rbtoc1428605597247 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1428605597247 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1413831485822">
+/*]]>*/</style><div class="toc-macro rbtoc1428605597247">
 <ul class="toc-indentation"><li><a shape="rect" href="#Pluginandpluginsgroup-Pluginbasics">Plugin basics</a></li><li><a shape="rect" href="#Pluginandpluginsgroup-Pluginsgroup">Plugins group</a></li></ul>
 </div>
 
@@ -393,7 +393,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="plugin-and-plugins-group.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="plugin-and-plugins-group.html">Plugin and plugins group</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="geronimo-architecture.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="geronimo-architecture.html">Geronimo Architecture</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="repositories.html">Repositories</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" 
 href="repositories.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="plugin-and-plugins-group.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="plugin-and-plugins-group.html">Plugin and plugins group</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="geronimo-architecture.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="geronimo-architecture.html">Geronimo Architecture</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="repositories.html">Repositories</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="repositories.html"><img align="middle" bor
 der="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 <p>A plugin group is basically a set of plugins for users to easily understand and consume. <a shape="rect" href="customizing-server-assemblies.html">Customizing server assemblies</a> will be easier and a plugin group can be managed as a regular plugin by using <a shape="rect" href="deploy.html">deploy</a> command. There are over 11 pre-defined groups for different distribution with Web Contaniner such as Tomcat and Jetty. We take Tomcat as an example here and introduce each plugins group and what plugins are included:</p>
 <ol><li>Geronimo Plugin Group :: Framework
 	<ul><li>Description: This plugin group provides the framework functionality. It is required to build a working server.</li><li>Plugin included:

Modified: websites/production/geronimo/content/GMOxDOC30/plugin-based-farming.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/plugin-based-farming.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/plugin-based-farming.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="jms-clustering-in-geronimo.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="jms-clustering-in-geronimo.html">JMS clustering in Geronimo</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="clustering-and-farming.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="clustering-and-farming.html">Clustering and farming</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="tomcat-native-clustering.html">Tomcat Native Clustering</a></td><td colspan="1" rowspan="1" class="Sc
 rollbarNextIcon"><a shape="rect" href="tomcat-native-clustering.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="jms-clustering-in-geronimo.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="jms-clustering-in-geronimo.html">JMS clustering in Geronimo</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="clustering-and-farming.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="clustering-and-farming.html">Clustering and farming</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="tomcat-native-clustering.html">Tomcat Native Clustering</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="tomcat-na
 tive-clustering.html"><img align="middle" border="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <p>This farming system uses plugins directly and is thus decoupled from the deployment system. It enables the plugin based farming administration for different servers or machines. Farming information is stored in a database using jps. The data model allows a single administration server to manage:</p>
 

Modified: websites/production/geronimo/content/GMOxDOC30/plugin-group.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC30/plugin-group.html (original)
+++ websites/production/geronimo/content/GMOxDOC30/plugin-group.html Thu Apr  9 18:54:52 2015
@@ -124,7 +124,7 @@ table.ScrollbarTable td.ScrollbarParent
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="plugin-and-plugins-group.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="plugin-and-plugins-group.html">Plugin and plugins group</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="geronimo-architecture.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="geronimo-architecture.html">Geronimo Architecture</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="repositories.html">Repositories</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" 
 href="repositories.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="plugin-and-plugins-group.html"><img align="middle" border="0" src="/images/confluence/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="plugin-and-plugins-group.html">Plugin and plugins group</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="geronimo-architecture.html"><img align="middle" border="0" src="/images/confluence/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="geronimo-architecture.html">Geronimo Architecture</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="repositories.html">Repositories</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="repositories.html"><img align="middle" bor
 der="0" src="/images/confluence/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 <p>A plugin group is basically a set of plugins for users to easily understand and consume. <a shape="rect" href="customizing-server-assemblies.html">Customizing server assemblies</a> will be easier and a plugin group can be managed as a regular plugin by using <a shape="rect" href="deploy.html">deploy</a> command. There are over 11 pre-defined groups for different distribution with Web Contaniner such as Tomcat and Jetty. We take Tomcat as an example here and introduce each plugins group and what plugins are included:</p>
 <ol><li>Geronimo Plugin Group :: Framework
 	<ul><li>Description: This plugin group provides the framework functionality. It is required to build a working server.</li><li>Plugin included:



Mime
View raw message