geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1030161 [4/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/GMOxDOC21/configuring-run-as-and-default-subjects-and-principal-role-mapping.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/configuring-run-as-and-default-subjects-and-principal-role-mapping.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/configuring-run-as-and-default-subjects-and-principal-role-mapping.html Mon May 21 13:00:07 2018
@@ -111,21 +111,20 @@
 
 <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.
@@ -133,11 +132,11 @@
 
 &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;
@@ -145,11 +144,11 @@
             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
@@ -158,14 +157,14 @@
         &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.
@@ -175,11 +174,11 @@
         &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
@@ -188,9 +187,9 @@
         &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
@@ -198,20 +197,20 @@
                     &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.
@@ -223,8 +222,7 @@
 
 
 &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>
@@ -232,7 +230,7 @@
 <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;
@@ -288,22 +286,21 @@
 
 <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.
@@ -312,25 +309,25 @@
 &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
@@ -340,32 +337,32 @@
             &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
@@ -380,84 +377,84 @@
         &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;
@@ -471,8 +468,7 @@
     &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 app plan, but otherwise you need to assure that the credential store gbean is in the ancestor configurations of the application.</p>
@@ -480,7 +476,7 @@
 <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;
@@ -505,7 +501,7 @@
 <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/GMOxDOC21/configuring-security.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/configuring-security.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/configuring-security.html Mon May 21 13:00:07 2018
@@ -138,10 +138,10 @@
                           <a href="https://cwiki.apache.org/confluence/display/GMOxDOC21/Configuring+SSL+client+authentication" title="Configuring SSL client authentication">Configuring SSL client authentication</a>
               <span class="smalltext">(Apache Geronimo v2.1)</span>
               <br>
-                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC21/Administering+certificates" title="Administering certificates">Administering certificates</a>
+                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC21/Administering+security+realms" title="Administering security realms">Administering security realms</a>
               <span class="smalltext">(Apache Geronimo v2.1)</span>
               <br>
-                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC21/Administering+security+realms" title="Administering security realms">Administering security realms</a>
+                          <a href="https://cwiki.apache.org/confluence/display/GMOxDOC21/Administering+certificates" title="Administering certificates">Administering certificates</a>
               <span class="smalltext">(Apache Geronimo v2.1)</span>
               <br>
                           <a href="https://cwiki.apache.org/confluence/display/GMOxDOC21/Certificate+Properties+File+Realm" title="Certificate Properties File Realm">Certificate Properties File Realm</a>

Modified: websites/production/geronimo/content/GMOxDOC21/convert-your-current-applications-into-plugins.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/convert-your-current-applications-into-plugins.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/convert-your-current-applications-into-plugins.html Mon May 21 13:00:07 2018
@@ -111,11 +111,11 @@ We have used an existing tutorial from t
 <p>Application client referred in this tutorial is actually a Web Application Client.</p></div></div>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343310628 {padding: 0px;}
-div.rbtoc1523343310628 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343310628 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907246214 {padding: 0px;}
+div.rbtoc1526907246214 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907246214 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343310628">
+/*]]>*/</style><div class="toc-macro rbtoc1526907246214">
 <ul class="toc-indentation"><li><a shape="rect" href="#Convertyourcurrentapplicationsintoplugins-Exportingtheapplicationasaplugin">Exporting the application as a plugin</a></li><li><a shape="rect" href="#Convertyourcurrentapplicationsintoplugins-CreateacustomrepositoryfromGeronimoAdministrativeConsole">Create a custom repository from Geronimo Administrative Console</a></li><li><a shape="rect" href="#Convertyourcurrentapplicationsintoplugins-Importingtheplugin">Importing the plugin</a></li></ul>
 </div>
 
@@ -134,7 +134,7 @@ div.rbtoc1523343310628 li {margin-left:
 <h1 id="Convertyourcurrentapplicationsintoplugins-CreateacustomrepositoryfromGeronimoAdministrativeConsole">Create a custom repository from Geronimo Administrative Console</h1>
 <ol><li>Create a folder say <strong>myplugins</strong> 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/GMOxDOC21/developing-an-application-client-to-access-ejb.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/developing-an-application-client-to-access-ejb.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/developing-an-application-client-to-access-ejb.html Mon May 21 13:00:07 2018
@@ -107,11 +107,11 @@
 
 <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.rbtoc1523343279494 {padding: 0px;}
-div.rbtoc1523343279494 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343279494 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907217759 {padding: 0px;}
+div.rbtoc1526907217759 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907217759 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343279494">
+/*]]>*/</style><div class="toc-macro rbtoc1526907217759">
 <ul class="toc-indentation"><li><a shape="rect" href="#DevelopinganApplicationClienttoaccessEJB-SettingupEclipseIDEforEJBapplicationdevelopment.">Setting up Eclipse IDE for EJB application development.</a></li><li><a shape="rect" href="#DevelopinganApplicationClienttoaccessEJB-DevelopingEJBLocalinterface,EJBRemoteInterfaceandBeanClass">Developing EJB Local interface, EJB Remote Interface and Bean Class</a></li><li><a shape="rect" href="#DevelopinganApplicationClienttoaccessEJB-DevelopingaJavaClient">Developing a Java Client</a></li><li><a shape="rect" href="#DevelopinganApplicationClienttoaccessEJB-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>
@@ -172,7 +172,7 @@ div.rbtoc1523343279494 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;
@@ -186,7 +186,7 @@ Here @Remote is an annotation used to de
 <br clear="none" class="atl-forced-newline"></li><li>Similarly create a Local interface <strong>CountryCapitalLocal</strong>. 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;
@@ -216,7 +216,7 @@ In remote as well as local interface we
 <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;
@@ -297,7 +297,7 @@ public class CountryCapitalBean implemen
 <br clear="none" class="atl-forced-newline"></li><li>Populate the ApplicationClient.java 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;
@@ -340,7 +340,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");
@@ -382,7 +382,7 @@ Once this is done we have the context th
 <div class="confluence-information-macro confluence-information-macro-warning"><p class="title">Why to Export EJB? Why cannot I use Eclipse for deploying the EJB application on the server?</p><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Due to some limitation Eclipse is not able to deploy the EJB application on to server. This issue will be fixed very soon.</p></div></div>
 <br clear="none" class="atl-forced-newline"></li><li>Start the server and Launch the Administrative Console. Under Applications, Select Deploy New and Deploy the SimpleEJB.jar on the server.</li><li>Once the Deployment is successful. Open &lt;GERONIMO_HOME&gt;/var/log/server.log. Find the following in server.log
 <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 server.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/GMOxDOC21/display-jvm-information.data/consoleJVM1.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/display-jvm-information.data/consoleJVM2.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/display-jvm-information.data/consoleJVM3.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/ejb-applications.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/ejb-applications.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/ejb-applications.html Mon May 21 13:00:07 2018
@@ -111,11 +111,11 @@
 <p>This document is organized in the following sections:</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343280517 {padding: 0px;}
-div.rbtoc1523343280517 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343280517 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907219005 {padding: 0px;}
+div.rbtoc1526907219005 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907219005 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343280517">
+/*]]>*/</style><div class="toc-macro rbtoc1526907219005">
 <ul class="toc-indentation"><li><a shape="rect" href="#EJBapplications-EJB2VsEJB3">EJB2 Vs EJB3</a></li><li><a shape="rect" href="#EJBapplications-TypesofBeans">Types of Beans</a></li><li><a shape="rect" href="#EJBapplications-StatelessSessionBean">Stateless Session Bean</a></li><li><a shape="rect" href="#EJBapplications-EJBtutorials">EJB tutorials</a></li></ul>
 </div>
 
@@ -141,7 +141,7 @@ We will discuss each type of Bean one by
 
 <p>Example of Simple Stateless Session Bean</p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>StatelessBean.java</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 @Stateless
 public class StatelessBean implements StatelessBeanRemote
 {

Modified: websites/production/geronimo/content/GMOxDOC21/gshell.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/gshell.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/gshell.html Mon May 21 13:00:07 2018
@@ -132,11 +132,11 @@ Deck.memoryPath = "/confluence/";
 <p>This document is organized in the following sections:</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343270030 {padding: 0px;}
-div.rbtoc1523343270030 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343270030 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907211384 {padding: 0px;}
+div.rbtoc1526907211384 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907211384 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343270030">
+/*]]>*/</style><div class="toc-macro rbtoc1526907211384">
 <ul class="toc-indentation"><li><a shape="rect" href="#GShell-RunningGShell">Running GShell</a></li><li><a shape="rect" href="#GShell-GeronimoGShellCommands">Geronimo GShell Commands</a></li><li><a shape="rect" href="#GShell-StartingandStoppingGeronimoinGshell">Starting and Stopping Geronimo in Gshell</a></li><li><a shape="rect" href="#GShell-ConnectingtoanAlreadyRunningGeronimoInstance">Connecting to an Already Running Geronimo Instance</a></li><li><a shape="rect" href="#GShell-DeployinganApplicationtoaServerInstance">Deploying an Application to a Server Instance</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#GShell-Deploy">Deploy</a></li><li><a shape="rect" href="#GShell-Redeploy">Redeploy</a></li><li><a shape="rect" href="#GShell-Undeploy">Undeploy</a></li><li><a shape="rect" href="#GShell-Distribute">Distribute</a></li></ul>
 </li></ul>

Modified: websites/production/geronimo/content/GMOxDOC21/hello-world-web-application.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/hello-world-web-application.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/hello-world-web-application.html Mon May 21 13:00:07 2018
@@ -112,11 +112,11 @@
 
 <p>The application development will take you through the following:</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343290255 {padding: 0px;}
-div.rbtoc1523343290255 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343290255 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907228343 {padding: 0px;}
+div.rbtoc1526907228343 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907228343 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343290255">
+/*]]>*/</style><div class="toc-macro rbtoc1526907228343">
 <ul class="toc-indentation"><li><a shape="rect" href="#HelloWorldWebApplication-CreatingaDynamicWebProjectusingEclipse">Creating a Dynamic Web Project using Eclipse</a></li><li><a shape="rect" href="#HelloWorldWebApplication-AddingaJSPtotheproject">Adding a JSP to the project</a></li><li><a shape="rect" href="#HelloWorldWebApplication-RunandDeploy">Run and Deploy</a></li></ul>
 </div>
 <h1 id="HelloWorldWebApplication-CreatingaDynamicWebProjectusingEclipse">Creating a Dynamic Web Project using Eclipse</h1>
@@ -130,7 +130,7 @@ div.rbtoc1523343290255 li {margin-left:
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="hello-world-web-application.data/createjsp.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Give the name as hello.jsp and Select next. Select Finish on the next screen<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="hello-world-web-application.data/createjsp2.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Modify the code of hello.jsp as follows
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>hello.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%&gt;
 &lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"&gt;

Modified: websites/production/geronimo/content/GMOxDOC21/how-to-build-geronimo-eclipse-plugin-from-source.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/how-to-build-geronimo-eclipse-plugin-from-source.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/how-to-build-geronimo-eclipse-plugin-from-source.html Mon May 21 13:00:07 2018
@@ -107,11 +107,11 @@
 <p>You can also change the default location of m2repo by modifying &lt;MAVEN_HOME&gt;/conf/settings.xml and modify the following tag<br clear="none">
 &lt;localRepository&gt;C:\m2repo&lt;/localRepository&gt;</p></div></div>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343314306 {padding: 0px;}
-div.rbtoc1523343314306 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343314306 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907253498 {padding: 0px;}
+div.rbtoc1526907253498 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907253498 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343314306">
+/*]]>*/</style><div class="toc-macro rbtoc1526907253498">
 <ul class="toc-indentation"><li><a shape="rect" href="#HowtoBuildGeronimoEclipsePluginfromSource-Gettingthesourcecode">Getting the source code</a></li><li><a shape="rect" href="#HowtoBuildGeronimoEclipsePluginfromSource-BuildingSource">Building Source</a></li><li><a shape="rect" href="#HowtoBuildGeronimoEclipsePluginfromSource-OtherMavenoptions">Other Maven options</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#HowtoBuildGeronimoEclipsePluginfromSource-SkipTest">Skip Test</a></li></ul>
 </li></ul>
@@ -138,7 +138,7 @@ MAVEN_OPTS="-Xms512m -Xmx512m -XX:MaxPer
 <p>On Windows use the following command to set the environment variable (note that double quotes should not be used):<br clear="none">
 set MAVEN_OPTS=-Xmx512m -XX:MaxPermSize=128m</p></div></div></li><li>Change to the trunk directory of the source you have downloaded and run the following command
 <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">
 mvn clean install -Ptestsuite
 </pre>
 </div></div>

Modified: websites/production/geronimo/content/GMOxDOC21/how-to-develop-geronimo-eclipse-plugin-in-eclipse.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/how-to-develop-geronimo-eclipse-plugin-in-eclipse.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/how-to-develop-geronimo-eclipse-plugin-in-eclipse.html Mon May 21 13:00:07 2018
@@ -103,18 +103,18 @@
           <div class="wiki-content maincontent">
 <ol><li>Build GEP using Maven.  See <a shape="rect" href="how-to-build-geronimo-eclipse-plugin-from-source.html">How to Build Geronimo Eclipse Plugin from Source</a> for details.  The projects are now ready to be imported into your Eclipse workspace.</li><li>Launch a clean installation of Eclipse Ganymede (See<a shape="rect" class="external-link" href="http://cwiki.apache.org/confluence/display/GMOxDOC21/Apache+Geronimo+Development+Tools+Project#ApacheGeronimoDevelopmentToolsProject-Prerequisites">this page</a> for details).</li><li>Follow these steps blow to complete the configuration of Eclipse for GEP development:
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343318333 {padding: 0px;}
-div.rbtoc1523343318333 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343318333 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907250714 {padding: 0px;}
+div.rbtoc1526907250714 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907250714 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343318333">
+/*]]>*/</style><div class="toc-macro rbtoc1526907250714">
 <ul class="toc-indentation"><li><a shape="rect" href="#HowtoDevelopGeronimoEclipsePlugininEclipse-SettinguptheClassPathvariable">Setting up the ClassPath variable</a></li><li><a shape="rect" href="#HowtoDevelopGeronimoEclipsePlugininEclipse-Settingupthetargetplatform">Setting up the target platform</a></li><li><a shape="rect" href="#HowtoDevelopGeronimoEclipsePlugininEclipse-ImportingsourcecodeinyourEclipseWorkspace">Importing source code in your Eclipse Workspace</a></li><li><a shape="rect" href="#HowtoDevelopGeronimoEclipsePlugininEclipse-RunandDebugConfigurations">Run and Debug Configurations</a></li></ul>
 </div>
 <h1 id="HowtoDevelopGeronimoEclipsePlugininEclipse-SettinguptheClassPathvariable">Setting up the ClassPath variable</h1></li><li>Select Window-&gt;Preferences as ahown in the figure.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-develop-geronimo-eclipse-plugin-in-eclipse.data/figure1.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Select <strong>Java-&gt;Build Path-&gt;Classpath Variables</strong>. Select New.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-develop-geronimo-eclipse-plugin-in-eclipse.data/figure2.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Enter the location of your m2repo. My m2repo is located at <strong>C:/m2repo</strong>. Select Ok.
 <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">
 *Name:* M2_REPO
 *Path:* C:\m2repo
 </pre>
@@ -138,7 +138,7 @@ Following steps need to be performed whi
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-develop-geronimo-eclipse-plugin-in-eclipse.data/figure8.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>On the next window select <strong>General-&gt;Existing Projects into Workspace</strong>. Select <strong>Next</strong>.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-develop-geronimo-eclipse-plugin-in-eclipse.data/figure9.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>On the import projects window Browse to <strong>&lt;GEP_Source_Home&gt;/trunk</strong>. Select Finish.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-develop-geronimo-eclipse-plugin-in-eclipse.data/figure10.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
-In case there are some errors try fixing those (consider it as your first step towards working with GEP! <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/5997/6f42626d00e36f53fe51440403446ca61552e2a2.1/_/images/icons/emoticons/smile.png" data-emoticon-name="smile" alt="(smile)"> ) or else use the <a shape="rect" class="external-link" href="http://geronimo.apache.org/mailing-lists.html">Geronimo mailing lists</a>.  See <a shape="rect" href="how-to-open-a-bug-for-geronimo-eclipse-plugin.html">How to open a bug for Geronimo Eclipse Plugin</a> for details.</li></ol>
+In case there are some errors try fixing those (consider it as your first step towards working with GEP! <img class="emoticon emoticon-smile" src="https://cwiki.apache.org/confluence/s/en_GB/7701/d7b403a44466e5e8970db7530201039d865e79e1/_/images/icons/emoticons/smile.svg" data-emoticon-name="smile" alt="(smile)"> ) or else use the <a shape="rect" class="external-link" href="http://geronimo.apache.org/mailing-lists.html">Geronimo mailing lists</a>.  See <a shape="rect" href="how-to-open-a-bug-for-geronimo-eclipse-plugin.html">How to open a bug for Geronimo Eclipse Plugin</a> for details.</li></ol>
 
 
 <h1 id="HowtoDevelopGeronimoEclipsePlugininEclipse-RunandDebugConfigurations">Run and Debug Configurations</h1>
@@ -148,7 +148,7 @@ In case there are some errors try fixing
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-develop-geronimo-eclipse-plugin-in-eclipse.data/figure12.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Name the new configuration as <strong>GEP_DEVELOPMENT</strong>.  Also, change the workspace location name from <strong>runtime-New_location</strong> to <strong>runtime-GEP_Development</strong>.  Select Apply.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-develop-geronimo-eclipse-plugin-in-eclipse.data/figure13.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Next select the Arguments tab for your <strong>GEP_Development</strong> run configuration and set the VM arguments as follows
 <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">
 -Xms256m -Xmx256m -XX:MaxPermSize=128m
 </pre>
 </div></div>

Modified: websites/production/geronimo/content/GMOxDOC21/how-to-install-geronimo-eclipse-plugin-v212.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/how-to-install-geronimo-eclipse-plugin-v212.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/how-to-install-geronimo-eclipse-plugin-v212.html Mon May 21 13:00:07 2018
@@ -102,11 +102,11 @@
           <div class="wiki-content maincontent">
 <p>We will be using Eclipse Ganymede and Sun JDK 6.0+ for the illustration. Geronimo Eclipse Plugin (GEP) can be installed using the following options</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343315981 {padding: 0px;}
-div.rbtoc1523343315981 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343315981 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907252287 {padding: 0px;}
+div.rbtoc1526907252287 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907252287 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343315981">
+/*]]>*/</style><div class="toc-macro rbtoc1526907252287">
 <ul class="toc-indentation"><li><a shape="rect" href="#HowtoinstallGeronimoEclipsePluginv2.1.2-PrerequisitesPrereqs">Prerequisites</a></li><li><a shape="rect" href="#HowtoinstallGeronimoEclipsePluginv2.1.2-InstallingGEPwithinWTP">Installing GEP within WTP</a></li><li><a shape="rect" href="#HowtoinstallGeronimoEclipsePluginv2.1.2-InstallingGEPusingEclipseupdatemanager">Installing GEP using Eclipse update manager</a></li><li><a shape="rect" href="#HowtoinstallGeronimoEclipsePluginv2.1.2-ManualInstallation">Manual Installation</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#HowtoinstallGeronimoEclipsePluginv2.1.2-Usingdeployable.zip">Using deployable.zip</a></li></ul>
 </li><li><a shape="rect" href="#HowtoinstallGeronimoEclipsePluginv2.1.2-VerifyGEPinstallation">Verify GEP installation</a></li></ul>
@@ -135,7 +135,7 @@ div.rbtoc1523343315981 li {margin-left:
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-install-geronimo-eclipse-plugin-v212.data/figure7.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>On the next screen select <strong>Available Software</strong> tab. Select <strong>Add Site</strong>.<br clear="none">
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="how-to-install-geronimo-eclipse-plugin-v212.data/figure8.png"></span><br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"></li><li>Copy and paste the following site to <strong>Add Site</strong> window and Select <strong>Ok</strong>.<br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline"> <br clear="none" class="atl-forced-newline">
 <div class="code panel pdl" style="border-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">
 http://apache.org/dist/geronimo/eclipse/updates/
 </pre>
 </div></div>

Modified: websites/production/geronimo/content/GMOxDOC21/how-to-open-a-bug-for-geronimo-eclipse-plugin.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/how-to-open-a-bug-for-geronimo-eclipse-plugin.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/how-to-open-a-bug-for-geronimo-eclipse-plugin.html Mon May 21 13:00:07 2018
@@ -114,11 +114,11 @@ Other questions pertaining to Eclipse, W
 <p>Search the <a shape="rect" class="external-link" href="http://issues.apache.org/jira/browse/GERONIMODEVTOOLS">GERONIMODEVTOOLS JIRA issue tracking database</a> to see if your bug has already been reported, or maybe even fixed. You may be able to add additional information to a previously reported bug.</p></div></div>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343314540 {padding: 0px;}
-div.rbtoc1523343314540 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343314540 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907252703 {padding: 0px;}
+div.rbtoc1526907252703 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907252703 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343314540">
+/*]]>*/</style><div class="toc-macro rbtoc1526907252703">
 <ul class="toc-indentation"><li><a shape="rect" href="#HowtoopenabugforGeronimoEclipsePlugin-ReportingaGEPbug">Reporting a GEP bug</a></li></ul>
 </div>
 <h1 id="HowtoopenabugforGeronimoEclipsePlugin-ReportingaGEPbug">Reporting a GEP bug</h1>

Modified: websites/production/geronimo/content/GMOxDOC21/import-database-pools-from-weblogic-81.data/bea_import1.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/import-database-pools-from-weblogic-81.data/bea_import2.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/import-database-pools-from-weblogic-81.data/bea_import3.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/import-database-pools-from-weblogic-81.data/bea_import4.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/import-database-pools-from-weblogic-81.data/bea_import5.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/import-database-pools-from-weblogic-81.data/bea_import6.jpg
==============================================================================
Binary files - no diff available.

Modified: websites/production/geronimo/content/GMOxDOC21/inventory-simple-database-access-application.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/inventory-simple-database-access-application.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/inventory-simple-database-access-application.html Mon May 21 13:00:07 2018
@@ -105,11 +105,11 @@
 
 <p>This article is organized in to following sections.</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343290714 {padding: 0px;}
-div.rbtoc1523343290714 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343290714 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907230692 {padding: 0px;}
+div.rbtoc1526907230692 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907230692 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343290714">
+/*]]>*/</style><div class="toc-macro rbtoc1526907230692">
 <ul class="toc-indentation"><li><a shape="rect" href="#inventory-SimpleDatabaseAccessApplication-ApplicationOverview">Application Overview</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#inventory-SimpleDatabaseAccessApplication-Applicationcontents">Application contents</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#inventory-SimpleDatabaseAccessApplication-SampleDatabase">Sample Database</a></li></ul>
@@ -164,7 +164,7 @@ The application workflow starts with add
 
 <p>This application defines a datasource with the help of the geronimo plan and <strong>web.xml</strong> deployment plans. The Geronimo plan from inventory-jetty or inventory-tomcat links the internal JNDI name "java:comp/env/jdbc/InventoryDS" to the sample database.</p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"&gt;
   &lt;dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
@@ -209,7 +209,7 @@ The application workflow starts with add
 
 <p>Following is the <strong>web.xml</strong> of the Inventory application. It declares the name "java:comp/env/jdbc/InventoryDS" used in ItemDAO to lookup the datasource.</p>
 <div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: websites/production/geronimo/content/GMOxDOC21/java-persistence-api-deployment-plans.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/java-persistence-api-deployment-plans.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/java-persistence-api-deployment-plans.html Mon May 21 13:00:07 2018
@@ -107,11 +107,11 @@
 
 <p>The document is organized as follows.</p>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1523343306961 {padding: 0px;}
-div.rbtoc1523343306961 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1523343306961 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1526907242209 {padding: 0px;}
+div.rbtoc1526907242209 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1526907242209 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1523343306961">
+/*]]>*/</style><div class="toc-macro rbtoc1526907242209">
 <ul class="toc-indentation"><li><a shape="rect" href="#JavaPersistenceAPIdeploymentplans-JavaPersistenceAPI">Java Persistence API</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JavaPersistenceAPIdeploymentplans-ShareAccountsample">ShareAccount sample</a></li><li><a shape="rect" href="#JavaPersistenceAPIdeploymentplans-Inheritancerelationshipinentities">Inheritance relationship in entities</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JavaPersistenceAPIdeploymentplans-Singledatabasetableperclasshierarchy">Single database table per class hierarchy</a></li></ul>
@@ -123,7 +123,7 @@ div.rbtoc1523343306961 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 <code>META-INF/</code> directory of the application archive. The application contains an ejb module and a web module. Ejb module uses a stateless session bean <code>ShareHolderBean</code> that uses JPA to perform database operations on the table <code>SHAREACCOUNT</code> in the <code>ShareDB</code> derby database. The <code>SHAREACCOUNT</code> table contains information about each shareholder along with the information regarding number shares he or she possesses currently in the account. The <code>ShareHolderBean</code> has methods that retrieve shareholder information, buy/sell shares of a particular shareholde
 r, close the shareholder account etc. The web application has a servlet that looks up the <code>ShareHolderBean</code> 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;
@@ -233,7 +233,7 @@ public class ShareAccount implements Ser
 <p>The annotations placed around some of the methods of the <code>ShareAccount</code> class are <code>@PrePersist, @PreUpdate, @PostUpdate and @PostLoad</code>. 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;
 
@@ -252,7 +252,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;
@@ -352,7 +352,7 @@ public class ShareHolderBean implements
 <p>The <code>ShareHolderBean.java</code> is the stateless session bean that uses JPA to perform database operations using <code>ShareAccount</code> 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"
@@ -386,7 +386,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;
@@ -527,7 +527,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;
@@ -555,7 +555,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;
@@ -656,7 +656,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;
@@ -723,7 +723,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><code>@DiscriminatorColumn</code> annotation designates table column to be used to discriminate rows that correspond to different entities in the class hierarchy.  <code>@DiscriminatorValue</code> annotation provides value that corresponds to the <code>Account</code> entity for the <code>DiscriminatorColumn</code>. The value is <code>Account</code>. 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 <code>SavingsAccount</code> and <code>CurrentAccount</code> 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;
@@ -782,7 +782,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><code>@DiscriminatorValue</code> annotation provides value that corresponds to the <code>SavingsAccount</code> entity for the <code>DiscriminatorColumn</code>. The value is <code>SAVINGSACCOUNT</code></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;
@@ -842,7 +842,7 @@ public class CurrentAccount extends Acco
 <p><code>@DiscriminatorValue</code> annotation provides value that corresponds to the <code>SavingsAccount</code> entity for the <code>DiscriminatorColumn</code>. The value is <code>CURRENTACCOUNT</code>. <br clear="none">
 The <code>CurrentAccount</code> entity has <code>currentAccountRules</code> field and <code>SavingsAccount</code> has <code>SavingsAccountRules</code> field. Both inherit fields from the parent entity <code>Account</code></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 {
@@ -876,7 +876,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;
@@ -992,7 +992,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;
@@ -1091,7 +1091,7 @@ public class Test extends
 </div></div>
 <p>The above servlet client only inserts entities in the table <code>ACCOUNT</code>. 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 
@@ -1134,7 +1134,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 <code>AccountDB</code> using admin console.</li><li>Create a table by name <code>ACCOUNT</code> 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/GMOxDOC21/jaxws-calculator-simple-web-service-with-jax-ws.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC21/jaxws-calculator-simple-web-service-with-jax-ws.html (original)
+++ websites/production/geronimo/content/GMOxDOC21/jaxws-calculator-simple-web-service-with-jax-ws.html Mon May 21 13:00:07 2018
@@ -110,7 +110,7 @@ Two clients are provided: a jsp page and
 <p>The <strong>Calculator</strong> interface defines the Service Endpoint Interface (SEI) for the Web Service. </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>Calculator.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 org.apache.geronimo.samples.jws;
 
 import javax.jws.WebMethod;
@@ -144,7 +144,7 @@ public interface Calculator {
 The <strong>context</strong> variable marked with the @Resource annotation will be injected at runtime. The <strong>WebServiceContext</strong> can be used to obtain the message context and security information relative to the call.</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>CalculatorService.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 org.apache.geronimo.samples.jws;
 
 import javax.annotation.Resource;
@@ -185,7 +185,7 @@ public class CalculatorService implement
 <p>The <strong>web.xml</strong> descriptor is used to deploy the Web Service. </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="UTF-8"?&gt;
 &lt;web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"&gt;
     &lt;servlet&gt;
@@ -218,7 +218,7 @@ public class CalculatorService implement
 <p>The geronimo plan has no information for the web service but does specify more information for the service-ref for the jsp client. For tomcat, the plan can be located after building the project in jaxws-calculator/jaxws-calculator-tomcat/target/resources/META-INF/plan.xml.   For Jetty, the plan can be located after building the project in jaxws-calculator/jaxws-calculator-jetty/target/resources/META-INF/plan.xml.</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 for tomcat</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-1.1"&gt;
   &lt;dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
     &lt;dep:moduleId&gt;
@@ -279,7 +279,7 @@ of the jaxws-calculator-war module, for
 
 <p>The following WSDL file describes the Web Service:</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>CalculatorService.wsdl</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;wsdl:definitions name="Calculator"
     xmlns="http://schemas.xmlsoap.org/wsdl/"
@@ -365,7 +365,7 @@ of the jaxws-calculator-war module, for
 <p>The <strong>add.jsp</strong> is a basic client for the <strong>CalculatorService</strong> Web Service.</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>add.jsp</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%&gt;
 &lt;%@ page import="javax.naming.InitialContext" %&gt;
 &lt;%@ page import="javax.xml.ws.Service" %&gt;
@@ -419,7 +419,7 @@ of the jaxws-calculator-war module, for
 <p>The <strong>add.jsp</strong> looks up a Web Service reference in the JNDI tree. The Web Service reference must first be added the web.xml 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>web.xml</b></div><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"&gt;
         .....

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

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



Mime
View raw message