geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r917744 [31/31] - in /websites/production/geronimo/content: GMOxDOC20/ GMOxDOC20/geronimo-eclipse-plugin-installation-instructions.data/ cache/
Date Tue, 29 Jul 2014 00:52:21 GMT
Modified: websites/production/geronimo/content/GMOxDOC20/very-simple-session-ejb-example.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC20/very-simple-session-ejb-example.html (original)
+++ websites/production/geronimo/content/GMOxDOC20/very-simple-session-ejb-example.html Tue Jul 29 00:52:18 2014
@@ -23,6 +23,7 @@
   <script src='http://geronimo.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
   <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
   <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushPlain.js' type='text/javascript'></script>
   
   <script type="text/javascript">
   SyntaxHighlighter.defaults['toolbar'] = false;
@@ -95,25 +96,40 @@
 
       <div class="pagecontent">
         <div class="wiki-content">
-          <div class="wiki-content maincontent"><style type="text/css">/*<![CDATA[*/
-table.ScrollbarTable  {border: none;padding: 3px;width: 100%;padding: 3px;margin: 0px;background-color: #f0f0f0}
-table.ScrollbarTable td.ScrollbarPrevIcon {text-align: center;width: 16px;border: none;}
-table.ScrollbarTable td.ScrollbarPrevName {text-align: left;border: none;}
-table.ScrollbarTable td.ScrollbarParent {text-align: center;border: none;}
-table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
-table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
+          <div class="wiki-content maincontent">    
+<div class="atb-scrollbar-macro">
+    <div class="prev">
+        <a shape="rect" href="very-simple-entity-ejb-example.html" rel="prev">
+                                    <span class="aui-icon aui-icon-small atb-icon-arrow-left">Previous</span>
+                                <span class="title">Very simple Entity EJB example</span>
+            </a>
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="very-simple-entity-ejb-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="very-simple-entity-ejb-example.html">Very simple Entity EJB example</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="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="sample-applications.html">Sample applications</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="web-application-security-sample.html">Web application security sample</a></td><td colspan="1" rows
 pan="1" class="ScrollbarNextIcon"><a shape="rect" href="web-application-security-sample.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>
+    </div>
+    <div class="parent">
+                    <a shape="rect" href="sample-applications.html" rel="parent">
+                                            <span class="aui-icon aui-icon-small atb-icon-arrow-up">Up</span>
+                                        <span class="title">Sample applications</span>
+                </a>
+
+            </div>
+    <div class="next">
+        <a shape="rect" href="web-application-security-sample.html" rel="next">
+                <span class="title">Web application security sample</span>
+                                    <span class="aui-icon aui-icon-small atb-icon-arrow-right">Next</span>
+                            </a>
+
+    </div>
+</div>
 
-<h1><a shape="rect" name="VerysimpleSessionEJBexample-TheTimeBeanExample"></a>The Time Bean Example</h1>
+<h1 id="VerysimpleSessionEJBexample-TheTimeBeanExample">The Time Bean Example</h1>
 
-<p>This is an example of a JSP-page calling a Session Bean. The result looks like this:<span class="image-wrap" style="display: block; text-align: center"><img src="very-simple-session-ejb-example.data/mytime.bmp" style="border: 0px solid black"></span><br clear="none">
+<p>This is an example of a JSP-page calling a Session Bean. The result looks like this:<img class="confluence-embedded-image image-center" src="https://cwiki.apache.org/confluence/download/attachments/60070/mytime.bmp?version=1&amp;modificationDate=1182941735000&amp;api=v2" data-image-src="/confluence/download/attachments/60070/mytime.bmp?version=1&amp;modificationDate=1182941735000&amp;api=v2"><br clear="none">
 I have tried to strip of everything just to make this example as easy as possible to understand. This is an example using Geronimo 2.0, Java 1.5 and EJB 3.0.</p>
 
-<h2><a shape="rect" name="VerysimpleSessionEJBexample-ApplicationContents"></a>Application Contents</h2>
+<h2 id="VerysimpleSessionEJBexample-ApplicationContents">Application Contents</h2>
 
-<p><b>MyTimeBean.java</b> is an EJB that can tell time. I have put my EJB in a package that I call org.apache.geronimo.samples.mytimepak. By using the @Stateless annotation Geronimo will recognize that this is a stateless session bean. There is no need for a ejb-jar.xml.</p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>MyTimeBean.java</b></div><div class="codeContent panelContent">
+<p><strong>MyTimeBean.java</strong> is an EJB that can tell time. I have put my EJB in a package that I call org.apache.geronimo.samples.mytimepak. By using the @Stateless annotation Geronimo will recognize that this is a stateless session bean. There is no need for a ejb-jar.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>MyTimeBean.java</b></div><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 package org.apache.geronimo.samples.mytimepak;
 
@@ -129,8 +145,8 @@ public class MyTimeBean implements MyTim
 }
 ]]></script>
 </div></div>
-<p><b>MyTimeLocal.java</b> is the Local interface. As this EJB will only be used from a JSP-page that is running in the same server (same JVM) I use a Local interface that do not make use of the network.</p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>MyTimeLocal.java</b></div><div class="codeContent panelContent">
+<p><strong>MyTimeLocal.java</strong> is the Local interface. As this EJB will only be used from a JSP-page that is running in the same server (same JVM) I use a Local interface that do not make use of the network.</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>MyTimeLocal.java</b></div><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 package org.apache.geronimo.samples.mytimepak;
 public interface MyTimeLocal {
@@ -138,16 +154,16 @@ public interface MyTimeLocal {
 }
 ]]></script>
 </div></div>
-<p><b>openejb-jar.xml</b> does nothing but specifies the module's information.</p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>openejb-jar.xml</b></div><div class="codeContent panelContent">
+<p><strong>openejb-jar.xml</strong> does nothing but specifies the module's information.</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>openejb-jar.xml</b></div><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;openejb-jar
-		xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
-		xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
-		xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
-		xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-		xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
+		xmlns=&quot;http://www.openejb.org/xml/ns/openejb-jar-2.1&quot;
+		xmlns:nam=&quot;http://geronimo.apache.org/xml/ns/naming-1.1&quot;
+		xmlns:pkgen=&quot;http://www.openejb.org/xml/ns/pkgen-2.0&quot;
+		xmlns:sec=&quot;http://geronimo.apache.org/xml/ns/security-1.1&quot;
+		xmlns:sys=&quot;http://geronimo.apache.org/xml/ns/deployment-1.2&quot;&gt;
   &lt;sys:environment&gt;
     &lt;sys:moduleId&gt;
       &lt;sys:groupId&gt;${pom.groupId}&lt;/sys:groupId&gt;
@@ -159,20 +175,20 @@ public interface MyTimeLocal {
 &lt;/openejb-jar&gt;
 ]]></script>
 </div></div>
-<p><b>index.jsp</b> utilizes the MyTimeBean to tell time.</p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>index.jsp</b></div><div class="codeContent panelContent">
+<p><strong>index.jsp</strong> utilizes the MyTimeBean to tell time.</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>index.jsp</b></div><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;%@ page contentType="text/html" import="org.apache.geronimo.samples.mytimepak.*, javax.naming.* " %&gt;
+&lt;%@ page contentType=&quot;text/html&quot; import=&quot;org.apache.geronimo.samples.mytimepak.*, javax.naming.* &quot; %&gt;
 &lt;html&lt;head&gt;&lt;title&gt;Time&lt;/title&gt;&lt;/head&gt;&lt;body&gt;
 &lt;%
-	String s="-"; // Just declare a string
+	String s=&quot;-&quot;; // Just declare a string
 	try {
 		// This creates a context, it can be used to lookup EJBs. Using normal RMI you would
 		// have to know port number and stuff. The InitialContext holds info like
 		// server names, ports and stuff I guess.
 		Context context = new InitialContext();
 		// MyTimeLocalHome is a reference to the EJB
-		MyTimeLocal myTimeLocal = (MyTimeLocal)context.lookup("java:comp/env/ejb/MyTimeBean");
+		MyTimeLocal myTimeLocal = (MyTimeLocal)context.lookup(&quot;java:comp/env/ejb/MyTimeBean&quot;);
 	        // So, just go ahead and call a method (in this case the only method).
 		s =  myTimeLocal.getTime();
 	}
@@ -184,14 +200,14 @@ This is the time returned from the EJB: 
 &lt;/body&gt;&lt;/html&gt;
 ]]></script>
 </div></div>
-<p><b>geronimo-web.xml</b> specifies the module's information and the url for the web-app.</p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent">
+<p><strong>geronimo-web.xml</strong> specifies the module's information and the url for the web-app.</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">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
-         xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
-         xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"&gt;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;web-app xmlns=&quot;http://geronimo.apache.org/xml/ns/j2ee/web-1.1&quot;
+         xmlns:nam=&quot;http://geronimo.apache.org/xml/ns/naming-1.1&quot;
+         xmlns:sec=&quot;http://geronimo.apache.org/xml/ns/security-1.1&quot;
+         xmlns:sys=&quot;http://geronimo.apache.org/xml/ns/deployment-1.1&quot;&gt;
   &lt;sys:environment&gt;
     &lt;sys:moduleId&gt;
       &lt;sys:groupId&gt;${pom.groupId}&lt;/sys:groupId&gt;
@@ -204,19 +220,19 @@ This is the time returned from the EJB: 
 &lt;/web-app&gt;
 ]]></script>
 </div></div>
-<p><b>web.xml</b> references the EJB present in the WEB-INF/classes/org/apache/geronimo/samples/mytimepak directory.</p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>web.xml</b></div><div class="codeContent panelContent">
+<p><strong>web.xml</strong> references the EJB present in the WEB-INF/classes/org/apache/geronimo/samples/mytimepak directory.</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">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;web-app id="WebApp_ID" version="2.4"
-    xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;web-app id=&quot;WebApp_ID&quot; version=&quot;2.4&quot;
+    xmlns=&quot;http://java.sun.com/xml/ns/j2ee&quot;
+    xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
+    xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd&quot;&gt;
 	&lt;display-name&gt;MyTimeWeb&lt;/display-name&gt;
 	&lt;welcome-file-list&gt;
 		&lt;welcome-file&gt;index.jsp&lt;/welcome-file&gt;
 	&lt;/welcome-file-list&gt;
-	&lt;!-- To refer local EJB's  --&gt;
+	&lt;!-- To refer local EJB&#39;s  --&gt;
 	&lt;ejb-local-ref&gt;
 		&lt;ejb-ref-name&gt;ejb/MyTimeBean&lt;/ejb-ref-name&gt;
 		&lt;ejb-ref-type&gt;Session&lt;/ejb-ref-type&gt;
@@ -226,22 +242,22 @@ This is the time returned from the EJB: 
 ]]></script>
 </div></div>
 
-<h2><a shape="rect" name="VerysimpleSessionEJBexample-ToolsUsed"></a>Tools Used</h2>
+<h2 id="VerysimpleSessionEJBexample-ToolsUsed">Tools Used</h2>
 
 
-<h3><a shape="rect" name="VerysimpleSessionEJBexample-ApacheMaven2"></a>Apache Maven 2</h3>
+<h3 id="VerysimpleSessionEJBexample-ApacheMaven2">Apache Maven 2</h3>
 
 <p>Maven is a popular open source build tool for enterprise Java projects, designed to take much of the hard work out of the build process. Maven uses a declarative approach, where the project structure and contents are described, rather than the task-based approach used in Ant or in traditional make files, for example. This helps enforce company-wide development standards and reduces the time needed to write and maintain build scripts. The declarative, lifecycle-based approach used by Maven 1 is, for many, a radical departure from more traditional build techniques, and Maven 2 goes even further in this regard. Maven 2 can be download from the following URL:<br clear="none">
 <a shape="rect" class="external-link" href="http://maven.apache.org">http://maven.apache.org</a></p>
 
-<h1><a shape="rect" name="VerysimpleSessionEJBexample-Building%2CandDeployingtheapplication"></a>Building, and Deploying the application</h1>
+<h1 id="VerysimpleSessionEJBexample-Building,andDeployingtheapplication">Building, and Deploying the application</h1>
 
 <p>Download the mytime application from the following link:<br clear="none">
-<a shape="rect" href="very-simple-session-ejb-example.data/mytime_.zip?version=1&amp;modificationDate=1182941904000">MyTime</a> (Note: This may not be the latest. Checkout the source code below for the latest.)</p>
+<a shape="rect" href="very-simple-session-ejb-example.data/mytime_.zip?version=1&amp;modificationDate=1182941904000&amp;api=v2">MyTime</a> (Note: This may not be the latest. Checkout the source code below for the latest.)</p>
 
-<p>After decompressing the given file, the <b>mytime</b> directory will be created.</p>
+<p>After decompressing the given file, the <strong>mytime</strong> directory will be created.</p>
 
-<h2><a shape="rect" name="VerysimpleSessionEJBexample-SourceCode"></a>Source Code</h2>
+<h2 id="VerysimpleSessionEJBexample-SourceCode">Source Code</h2>
 
 <p>You can checkout the source code of this sample from SVN:</p>
 
@@ -249,17 +265,17 @@ This is the time returned from the EJB: 
 
 <p>(Hint: If you are on Windows you will need to obtain svn from <a shape="rect" class="external-link" href="http://subversion.tigris.org/" rel="nofollow">http://subversion.tigris.org/</a> )</p>
 
-<h2><a shape="rect" name="VerysimpleSessionEJBexample-Building"></a>Building</h2>
+<h2 id="VerysimpleSessionEJBexample-Building">Building</h2>
 
-<p>Use a command prompt to navigate into the <b>mytime</b> directory and just give <b>mvn clean install site</b> command to build. It will create the <b>mytime-ear-2.0-SNAPSHOT.ear</b> under the <b>mytime</b> folder. Now, you are ready to deploy <b>mytime</b> application in the Geronimo Application server.</p>
+<p>Use a command prompt to navigate into the <strong>mytime</strong> directory and just give <strong>mvn clean install site</strong> command to build. It will create the <strong>mytime-ear-2.0-SNAPSHOT.ear</strong> under the <strong>mytime</strong> folder. Now, you are ready to deploy <strong>mytime</strong> application in the Geronimo Application server.</p>
 
-<h2><a shape="rect" name="VerysimpleSessionEJBexample-DeployingtheApplication"></a>Deploying the Application</h2>
+<h2 id="VerysimpleSessionEJBexample-DeployingtheApplication">Deploying the Application</h2>
 
 <p>Deploying sample application is pretty straight forward as we are going to use the Geronimo Console.</p>
-<ol><li>Scroll down to <b>Deploy New</b> from the Console Navigation panel.</li><li>Load <b>mytime-ear-2.0-SNAPSHOT.ear</b> from <b>mytime</b> folder in to the <b>Archive</b> input box.</li><li>Press <b>Install</b> button to deploy application in the server.</li></ol>
+<ol><li>Scroll down to <strong>Deploy New</strong> from the Console Navigation panel.</li><li>Load <strong>mytime-ear-2.0-SNAPSHOT.ear</strong> from <strong>mytime</strong> folder in to the <strong>Archive</strong> input box.</li><li>Press <strong>Install</strong> button to deploy application in the server.</li></ol>
 
 
-<h2><a shape="rect" name="VerysimpleSessionEJBexample-MyTimeWebApplication"></a>MyTime Web Application</h2>
+<h2 id="VerysimpleSessionEJBexample-MyTimeWebApplication">MyTime Web Application</h2>
 
 <p>To test the sample web application open a browser and type <a shape="rect" class="external-link" href="http://localhost:8080/mytime" rel="nofollow">http://localhost:8080/mytime</a>.</p></div>
         </div>

Modified: websites/production/geronimo/content/GMOxDOC20/web-access-log-viewer.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC20/web-access-log-viewer.html (original)
+++ websites/production/geronimo/content/GMOxDOC20/web-access-log-viewer.html Tue Jul 29 00:52:18 2014
@@ -18,6 +18,17 @@
 
     <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
 
+  <link href='http://geronimo.apache.org/resources/highlighter/styles/shCoreGeronimo.css' rel='stylesheet' type='text/css' />
+  <link href='http://geronimo.apache.org/resources/highlighter/styles/shThemeGeronimo.css' rel='stylesheet' type='text/css' />
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushPlain.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
 
     <title>Apache Geronimo v2.0 Documentation : Web Access Log Viewer</title>
 
@@ -85,35 +96,45 @@
 
       <div class="pagecontent">
         <div class="wiki-content">
-          <div class="wiki-content maincontent"><style type="text/css">/*<![CDATA[*/
-table.ScrollbarTable  {border: none;padding: 3px;width: 100%;padding: 3px;margin: 0px;background-color: #f0f0f0}
-table.ScrollbarTable td.ScrollbarPrevIcon {text-align: center;width: 16px;border: none;}
-table.ScrollbarTable td.ScrollbarPrevName {text-align: left;border: none;}
-table.ScrollbarTable td.ScrollbarParent {text-align: center;border: none;}
-table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
-table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
+          <div class="wiki-content maincontent">    
+<div class="atb-scrollbar-macro">
+    <div class="prev">
+        <a shape="rect" href="server-log-viewer.html" rel="prev">
+                                    <span class="aui-icon aui-icon-small atb-icon-arrow-left">Previous</span>
+                                <span class="title">Server Log Viewer</span>
+            </a>
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="server-log-viewer.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="server-log-viewer.html">Server Log Viewer</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="configure-log-level.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="configure-log-level.html">Configure log level</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+    </div>
+    <div class="parent">
+                    <a shape="rect" href="configure-log-level.html" rel="parent">
+                                            <span class="aui-icon aui-icon-small atb-icon-arrow-up">Up</span>
+                                        <span class="title">Configure log level</span>
+                </a>
+
+            </div>
+    <div class="next">
+        
+    </div>
+</div>
 
 <p>The Web Access Log Viewer portlet options are illustrated in the following figure. From this portlet you can view the Web server logs as well as set filters for refining the results displayed.</p>
 
-<p><span class="image-wrap" style=""><img src="web-access-log-viewer.data/WebAccessLogViewer.jpg" style="border: 0px solid black"></span></p>
+<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/46593/WebAccessLogViewer.jpg?version=1&amp;modificationDate=1172056335000&amp;api=v2" data-image-src="/confluence/download/attachments/46593/WebAccessLogViewer.jpg?version=1&amp;modificationDate=1172056335000&amp;api=v2"></p>
 
-<p>The <b>Refresh</b> link on the upper left corner will reset any filtering criteria you may have specified to the <a shape="rect" href="geronimo-administration-console.html" title="Geronimo Administration Console">Geronimo Administration Console</a>'s defaults. In contrast with the other portlets, the <b>Web Access Log Viewer</b> will display all the lines in the log, it will just be limited by your Web browser display capabilities.</p>
+<p>The <strong>Refresh</strong> link on the upper left corner will reset any filtering criteria you may have specified to the <a shape="rect" href="geronimo-administration-console.html">Geronimo Administration Console</a>'s defaults. In contrast with the other portlets, the <strong>Web Access Log Viewer</strong> will display all the lines in the log, it will just be limited by your Web browser display capabilities.</p>
 
-<p>The <b>Filter Results:</b> area will let you specify different filtering criteria to further narrowing down your search. For the Web Access Log Viewer this area is divided in three main groups, <b>Date</b>, <b>Identity</b> and <b>Requests</b>.</p>
+<p>The <strong>Filter Results:</strong> area will let you specify different filtering criteria to further narrowing down your search. For the Web Access Log Viewer this area is divided in three main groups, <strong>Date</strong>, <strong>Identity</strong> and <strong>Requests</strong>.</p>
 
-<ul><li><b>Date:</b><br clear="none">
-Lets you specify a date range. If the <b>Ignore Dates</b> checkbox is selected, filtering will not be done using the date. All log lines that match the other filtering criteria will be displayed regardless of the date.</li></ul>
+<ul><li><strong>Date:</strong><br clear="none">
+Lets you specify a date range. If the <strong>Ignore Dates</strong> checkbox is selected, filtering will not be done using the date. All log lines that match the other filtering criteria will be displayed regardless of the date.</li></ul>
 
 
-<ul><li><b>Identity:</b><br clear="none">
-Lets you specify <b>Remote Address</b> (i.e. 192.168.0.1) and <b>Authenticated User</b> (i.e. system). </li></ul>
+<ul><li><strong>Identity:</strong><br clear="none">
+Lets you specify <strong>Remote Address</strong> (i.e. 192.168.0.1) and <strong>Authenticated User</strong> (i.e. system). </li></ul>
 
 
-<ul><li><b>Request:</b><br clear="none">
-Lets you specify the Request Method from and the Requested URI. You can select the Requested Method from a drop-down menu, the possible values are <b>ANY</b>, <b>POST</b> and <b>GET</b>. To filter by Requested URI just enter a URI, for example <a shape="rect" class="external-link" href="http://localhost:8080/console/login.jsp" rel="nofollow">http://localhost:8080/console/login.jsp</a>.</li></ul>
-</div>
+<ul><li><strong>Request:</strong><br clear="none">
+Lets you specify the Request Method from and the Requested URI. You can select the Requested Method from a drop-down menu, the possible values are <strong>ANY</strong>, <strong>POST</strong> and <strong>GET</strong>. To filter by Requested URI just enter a URI, for example <a shape="rect" class="external-link" href="http://localhost:8080/console/login.jsp" rel="nofollow">http://localhost:8080/console/login.jsp</a>.</li></ul></div>
         </div>
 
         

Modified: websites/production/geronimo/content/GMOxDOC20/web-application-security-sample.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC20/web-application-security-sample.html (original)
+++ websites/production/geronimo/content/GMOxDOC20/web-application-security-sample.html Tue Jul 29 00:52:18 2014
@@ -23,6 +23,7 @@
   <script src='http://geronimo.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
   <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
   <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushPlain.js' type='text/javascript'></script>
   
   <script type="text/javascript">
   SyntaxHighlighter.defaults['toolbar'] = false;
@@ -95,18 +96,29 @@
 
       <div class="pagecontent">
         <div class="wiki-content">
-          <div class="wiki-content maincontent"><style type="text/css">/*<![CDATA[*/
-table.ScrollbarTable  {border: none;padding: 3px;width: 100%;padding: 3px;margin: 0px;background-color: #f0f0f0}
-table.ScrollbarTable td.ScrollbarPrevIcon {text-align: center;width: 16px;border: none;}
-table.ScrollbarTable td.ScrollbarPrevName {text-align: left;border: none;}
-table.ScrollbarTable td.ScrollbarParent {text-align: center;border: none;}
-table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
-table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
+          <div class="wiki-content maincontent">    
+<div class="atb-scrollbar-macro">
+    <div class="prev">
+        <a shape="rect" href="very-simple-session-ejb-example.html" rel="prev">
+                                    <span class="aui-icon aui-icon-small atb-icon-arrow-left">Previous</span>
+                                <span class="title">Very simple Session EJB example</span>
+            </a>
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="very-simple-session-ejb-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="very-simple-session-ejb-example.html">Very simple Session EJB example</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="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="sample-applications.html">Sample applications</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
-<p><a shape="rect" name="Webapplicationsecuritysample-top"></a></p>
+    </div>
+    <div class="parent">
+                    <a shape="rect" href="sample-applications.html" rel="parent">
+                                            <span class="aui-icon aui-icon-small atb-icon-arrow-up">Up</span>
+                                        <span class="title">Sample applications</span>
+                </a>
+
+            </div>
+    <div class="next">
+        
+    </div>
+</div>
+<p><span class="confluence-anchor-link" id="Webapplicationsecuritysample-top"></span></p>
 
-<p>This article focuses on the web application security related features of the Apache Geronimo server. The sample application covered in this article is a basic time reporting system that uses Servlets, JSPs and J2EE declarative security. In addition to above features it uses Geronimo's embedded Derby database to store user information of the system. Even though this application uses a database to hold user information, it is merely for configuration purposes. For detailed information on the usage of JDBC in Geronimo, refer the <a shape="rect" href="../GMOxDOC12/simple-database-access-sample-application-12-ok.html" title="Simple database access sample application (1.2 Ok)">Simple database access sample application</a> article.  </p>
+<p>This article focuses on the web application security related features of the Apache Geronimo server. The sample application covered in this article is a basic time reporting system that uses Servlets, JSPs and J2EE declarative security. In addition to above features it uses Geronimo's embedded Derby database to store user information of the system. Even though this application uses a database to hold user information, it is merely for configuration purposes. For detailed information on the usage of JDBC in Geronimo, refer the <a shape="rect" href="../GMOxDOC12/simple-database-access-sample-application-12-ok.html">Simple database access sample application</a> article.  </p>
 
 <p>After reading this article you should be able to configure Geronimo application server for web applications with declarative security features.</p>
 
@@ -114,23 +126,23 @@ table.ScrollbarTable td.ScrollbarNextIco
 <ul><li><a shape="rect" href="#Webapplicationsecuritysample-web">Web Applications Geronimo</a></li><li><a shape="rect" href="#Webapplicationsecuritysample-overview">Application Overview</a></li><li><a shape="rect" href="#Webapplicationsecuritysample-configure">Configuring, Building and Deploying the Sample Application</a></li><li><a shape="rect" href="#Webapplicationsecuritysample-testing">Testing of the Sample Application</a></li><li><a shape="rect" href="#Webapplicationsecuritysample-summary">Summary</a></li></ul>
 
 
-<h1><a shape="rect" name="Webapplicationsecuritysample-WebApplicationsinGeronimo"></a>Web Applications in Geronimo<a shape="rect" name="Webapplicationsecuritysample-web"></a></h1>
+<h1 id="Webapplicationsecuritysample-WebApplicationsinGeronimoweb">Web Applications in Geronimo<span class="confluence-anchor-link" id="Webapplicationsecuritysample-web"></span></h1>
 
 <p>Apache Geronimo includes a Web application container supporting J2EE Web applications. The Web container itself supports basic configuration such as network ports and SSL options, and each Web application may include Geronimo-specific configuration information as well. Web applications participate in the Geronimo security infrastructure, so authenticating to a Web application allows access to secure EJBs and Connectors as well.</p>
 
 <p>Apache Geronimo currently supports two Web containers: Jetty and Tomcat. </p>
 
-<h3><a shape="rect" name="Webapplicationsecuritysample-Jetty"></a>Jetty</h3>
+<h3 id="Webapplicationsecuritysample-Jetty">Jetty</h3>
 <p>Jetty is a 100% Java HTTP Server and Servlet Container. This means that you do not need to configure and run a separate Web server in order to use servlets and JSPs to generate dynamic content. Jetty is a fully featured Web server for static and dynamic content.</p>
 
 <p>Unlike separate server/container solutions, Jetty's Web server and Web application run in the same process without interconnection overheads and complications. Furthermore, as a pure java component, Jetty can be easily included in your application for demonstration, distribution or deployment. Jetty is available on all Java supported platforms.<br clear="none">
 <a shape="rect" class="external-link" href="http://jetty.mortbay.org/jetty/index.html" rel="nofollow">http://jetty.mortbay.org/jetty/index.html</a></p>
 
-<h3><a shape="rect" name="Webapplicationsecuritysample-Tomcat"></a>Tomcat</h3>
+<h3 id="Webapplicationsecuritysample-Tomcat">Tomcat</h3>
 <p>Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies.<br clear="none">
 <a shape="rect" class="external-link" href="http://tomcat.apache.org/">http://tomcat.apache.org/</a></p>
 
-<h1><a shape="rect" name="Webapplicationsecuritysample-ApplicationOverview"></a>Application Overview <a shape="rect" name="Webapplicationsecuritysample-overview"></a></h1>
+<h1 id="Webapplicationsecuritysample-ApplicationOverviewoverview">Application Overview <span class="confluence-anchor-link" id="Webapplicationsecuritysample-overview"></span></h1>
 
 <p>The Time Report application helps to report working times of different projects. Even though this is not a full blown time reporting application, it covers most of the displaying and security related features web applications in Apache Geronimo.</p>
 
@@ -142,12 +154,12 @@ table.ScrollbarTable td.ScrollbarNextIco
 
 <p>The following figure illustrates overview of application flow:</p>
 
-<p><span class="image-wrap" style="display: block; text-align: center"><img src="web-application-security-sample.data/time_report_flow.gif" style="border: 0px solid black"></span><br clear="none">
+<p><img class="confluence-embedded-image image-center" src="https://cwiki.apache.org/confluence/download/attachments/59623/time_report_flow.gif?version=1&amp;modificationDate=1181816696000&amp;api=v2" data-image-src="/confluence/download/attachments/59623/time_report_flow.gif?version=1&amp;modificationDate=1181816696000&amp;api=v2"><br clear="none">
 By default the given sample application is directed to the Welcome page with a link to the Time Report functionality. The users can access the Time Report page by providing a valid user name and password to the Login page. If those provided user credentials are from a manager role, Time Report page will display an additional link to the Add Employees functionality too.</p>
 
-<h2><a shape="rect" name="Webapplicationsecuritysample-Applicationcontents"></a>Application contents</h2>
+<h2 id="Webapplicationsecuritysample-Applicationcontents">Application contents</h2>
 <p>Following is the main folder hierarchy of the Time Reporting application. It display both JSPs and configuration files used in the application.</p>
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 |- employee
      |- index.jsp
@@ -168,19 +180,19 @@ By default the given sample application 
 <ul><li>AddTimeRecordServlet - Read the input data from the Time Report page</li><li>AddEmployeeServlet - Capture input information from Add Employee page</li></ul>
 
 
-<p>Security configuration of the Time Report application is handled by <b>geronimo-web.xml</b> and <b>web.xml</b> files. <b>geronimo-web.xml</b> is used to define user roles of the application with <b>TimeReportRealm</b>.</p>
+<p>Security configuration of the Time Report application is handled by <strong>geronimo-web.xml</strong> and <strong>web.xml</strong> files. <strong>geronimo-web.xml</strong> is used to define user roles of the application with <strong>TimeReportRealm</strong>.</p>
 
-<p>The first part of <b>geronimo-web.xml</b> is straight forward. However, the security configuration is tricky. The &lt;security-realm-name&gt; is described in the &lt;security&gt; element through a sequence of declarations in the &lt;realms&gt; element.</p>
+<p>The first part of <strong>geronimo-web.xml</strong> is straight forward. However, the security configuration is tricky. The &lt;security-realm-name&gt; is described in the &lt;security&gt; element through a sequence of declarations in the &lt;realms&gt; element.</p>
 
 <p>While the web.xml specifies the security roles, the geronimo-web.xml maps to which specific users or groups in the Geronimo security realms they belong to. If there is a user that is not logged in, it defaults to what is defined in the &lt;default-principal&gt; element.</p>
 
 <p>There are two roles that are issued in this project: manager and employee. Since a manager is also an employee of the company, it will be listed under employee too. However, it also has its spot under the 'manager' role.</p>
 
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-web.xml</b></div><div class="codeContent panelContent">
+<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">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;web-app
-	xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"&gt;
+	xmlns=&quot;http://geronimo.apache.org/xml/ns/j2ee/web-1.1&quot;&gt;
 	
 	&lt;environment&gt;
 		&lt;moduleId&gt;
@@ -196,28 +208,28 @@ By default the given sample application 
 	&lt;security-realm-name&gt;TimeReportRealm&lt;/security-realm-name&gt;
 	
 	&lt;security&gt;
-		&lt;default-principal realm-name="TimeReportRealm"&gt;
-			&lt;principal name="anonymous"
-				   class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
+		&lt;default-principal realm-name=&quot;TimeReportRealm&quot;&gt;
+			&lt;principal name=&quot;anonymous&quot;
+				   class=&quot;org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal&quot;
 				   /&gt;
 		&lt;/default-principal&gt;
 		&lt;role-mappings&gt;			
-			&lt;role role-name="employee"&gt;
-				&lt;realm realm-name="TimeReportRealm"&gt;
-					&lt;principal name="EmployeeGroup"
-					   class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+			&lt;role role-name=&quot;employee&quot;&gt;
+				&lt;realm realm-name=&quot;TimeReportRealm&quot;&gt;
+					&lt;principal name=&quot;EmployeeGroup&quot;
+					   class=&quot;org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal&quot;
 				   	/&gt;
 				&lt;/realm&gt;
-				&lt;realm realm-name="TimeReportRealm"&gt;
-					&lt;principal name="ManagerGroup"
-					   class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+				&lt;realm realm-name=&quot;TimeReportRealm&quot;&gt;
+					&lt;principal name=&quot;ManagerGroup&quot;
+					   class=&quot;org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal&quot;
 					/&gt;					
 				&lt;/realm&gt;
 			&lt;/role&gt;
-			&lt;role role-name="manager"&gt;
-				&lt;realm realm-name="TimeReportRealm"&gt;
-					&lt;principal name="ManagerGroup"
-					   class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+			&lt;role role-name=&quot;manager&quot;&gt;
+				&lt;realm realm-name=&quot;TimeReportRealm&quot;&gt;
+					&lt;principal name=&quot;ManagerGroup&quot;
+					   class=&quot;org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal&quot;
 					/&gt;					
 				&lt;/realm&gt;								
 			&lt;/role&gt;
@@ -228,15 +240,15 @@ By default the given sample application 
 ]]></script>
 </div></div> 
 
-<p><b>web.xml</b> will map the defined user roles to resources in the web application. It also defines the login configurations of the application.</p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>web.xml</b></div><div class="codeContent panelContent">
+<p><strong>web.xml</strong> will map the defined user roles to resources in the web application. It also defines the login configurations of the application.</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">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&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"
-	 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-	 http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	 version="2.4"&gt;	
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;web-app xmlns=&quot;http://java.sun.com/xml/ns/j2ee&quot;
+	 xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
+	 xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/j2ee
+	 http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd&quot;
+	 version=&quot;2.4&quot;&gt;	
 	 
 	&lt;welcome-file-list&gt;
 		&lt;welcome-file&gt;index.jsp&lt;/welcome-file&gt;
@@ -303,25 +315,25 @@ By default the given sample application 
 </div></div>
 
 <p>To restrict access to the Add Employee functionality from Time Report page, programmatic authentication has beeen used as in indicated below. </p>
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>employee/index.jsp</b></div><div class="codeContent panelContent">
+<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>employee/index.jsp</b></div><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 ...
 &lt;BR&gt;
-&lt;%if(request.isUserInRole("manager")){%&gt;
-&lt;A href="../manager/"&gt;Add Employees&lt;/A&gt;
+&lt;%if(request.isUserInRole(&quot;manager&quot;)){%&gt;
+&lt;A href=&quot;../manager/&quot;&gt;Add Employees&lt;/A&gt;
 &lt;BR&gt;
 ...
 ]]></script>
 </div></div>
 
-<p><b>geronimo-application.xml</b> tells the application that there is a database pool that needs to be deployed as well. The <b>security realm</b> configurations are included along with this db pool. The db pool is defined in TimeReportPool.xml and the driver that is needs in order to be deployed is the tranql-connector-ra-1.3.rar file--these two files will reside on the top level layer of the resultant EAR file.</p>
+<p><strong>geronimo-application.xml</strong> tells the application that there is a database pool that needs to be deployed as well. The <strong>security realm</strong> configurations are included along with this db pool. The db pool is defined in TimeReportPool.xml and the driver that is needs in order to be deployed is the tranql-connector-ra-1.3.rar file--these two files will reside on the top level layer of the resultant EAR file.</p>
 
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>geronimo-application.xml</b></div><div class="codeContent panelContent">
+<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-application.xml</b></div><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"&gt;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;application xmlns=&quot;http://geronimo.apache.org/xml/ns/j2ee/application-1.2&quot;&gt;
 
-    &lt;environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
+    &lt;environment xmlns=&quot;http://geronimo.apache.org/xml/ns/deployment-1.2&quot;&gt;
         &lt;moduleId&gt;
             &lt;groupId&gt;${pom.groupId}&lt;/groupId&gt;
             &lt;artifactId&gt;${pom.artifactId}&lt;/artifactId&gt;
@@ -338,13 +350,13 @@ By default the given sample application 
 ]]></script>
 </div></div>
 
-<p><b>TimeReportPool.xml</b> defines two things: the database pool itself and a security realm. As shown, the first part is similar to any other db pool plan. The second part, are the essentials for a security realm plan. By combining the two into a separate file, we can ship a db pool and a security realm with the application so it will require less things to install.</p>
+<p><strong>TimeReportPool.xml</strong> defines two things: the database pool itself and a security realm. As shown, the first part is similar to any other db pool plan. The second part, are the essentials for a security realm plan. By combining the two into a separate file, we can ship a db pool and a security realm with the application so it will require less things to install.</p>
 
-<div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>TimeReportPool.xml</b></div><div class="codeContent panelContent">
+<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>TimeReportPool.xml</b></div><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"&gt;
-    &lt;dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"&gt;
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+&lt;connector xmlns=&quot;http://geronimo.apache.org/xml/ns/j2ee/connector-1.2&quot;&gt;
+    &lt;dep:environment xmlns:dep=&quot;http://geronimo.apache.org/xml/ns/deployment-1.2&quot;&gt;
         &lt;dep:moduleId&gt;
             &lt;dep:groupId&gt;console.dbpool&lt;/dep:groupId&gt;
             &lt;dep:artifactId&gt;TimeReportPool&lt;/dep:artifactId&gt;
@@ -371,9 +383,9 @@ By default the given sample application 
                 &lt;connectionfactory-interface&gt;javax.sql.DataSource&lt;/connectionfactory-interface&gt;
                 &lt;connectiondefinition-instance&gt;
                     &lt;name&gt;TimeReportPool&lt;/name&gt;
-                    &lt;config-property-setting name="Driver"&gt;org.apache.derby.jdbc.EmbeddedDriver&lt;/config-property-setting&gt;
-                    &lt;config-property-setting name="UserName"&gt;app&lt;/config-property-setting&gt;
-                    &lt;config-property-setting name="ConnectionURL"&gt;jdbc:derby:TimeReportDB&lt;/config-property-setting&gt;
+                    &lt;config-property-setting name=&quot;Driver&quot;&gt;org.apache.derby.jdbc.EmbeddedDriver&lt;/config-property-setting&gt;
+                    &lt;config-property-setting name=&quot;UserName&quot;&gt;app&lt;/config-property-setting&gt;
+                    &lt;config-property-setting name=&quot;ConnectionURL&quot;&gt;jdbc:derby:TimeReportDB&lt;/config-property-setting&gt;
                     &lt;connectionmanager&gt;
                         &lt;local-transaction/&gt;
                         &lt;single-pool&gt;
@@ -387,21 +399,21 @@ By default the given sample application 
         &lt;/outbound-resourceadapter&gt;
     &lt;/resourceadapter&gt;
 	&lt;!--security realm fragment--&gt;
-	&lt;gbean name="TimeReportRealm" class="org.apache.geronimo.security.realm.GenericSecurityRealm"&gt;
-		&lt;attribute name="realmName"&gt;TimeReportRealm&lt;/attribute&gt;
-		&lt;reference name="ServerInfo"&gt;
+	&lt;gbean name=&quot;TimeReportRealm&quot; class=&quot;org.apache.geronimo.security.realm.GenericSecurityRealm&quot;&gt;
+		&lt;attribute name=&quot;realmName&quot;&gt;TimeReportRealm&lt;/attribute&gt;
+		&lt;reference name=&quot;ServerInfo&quot;&gt;
 			&lt;name&gt;ServerInfo&lt;/name&gt;
 		&lt;/reference&gt;
-		&lt;xml-reference name="LoginModuleConfiguration"&gt;
-			&lt;log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.1"&gt;
-				&lt;log:login-module control-flag="REQUIRED" wrap-principals="false"&gt;
+		&lt;xml-reference name=&quot;LoginModuleConfiguration&quot;&gt;
+			&lt;log:login-config xmlns:log=&quot;http://geronimo.apache.org/xml/ns/loginconfig-1.1&quot;&gt;
+				&lt;log:login-module control-flag=&quot;REQUIRED&quot; wrap-principals=&quot;false&quot;&gt;
 					&lt;log:login-domain-name&gt;TimeReportRealm&lt;/log:login-domain-name&gt;
 					&lt;log:login-module-class&gt;org.apache.geronimo.security.realm.providers.SQLLoginModule&lt;/log:login-module-class&gt;
-					&lt;log:option name="jdbcDriver"&gt;org.apache.derby.jdbc.EmbeddedDriver&lt;/log:option&gt;
-					&lt;log:option name="jdbcUser"&gt;app&lt;/log:option&gt;
-					&lt;log:option name="userSelect"&gt;select userid, password from users where userid=?&lt;/log:option&gt;
-					&lt;log:option name="groupSelect"&gt;select userid, groupname from usergroups where userid=?&lt;/log:option&gt;
-					&lt;log:option name="jdbcURL"&gt;jdbc:derby:TimeReportDB&lt;/log:option&gt;
+					&lt;log:option name=&quot;jdbcDriver&quot;&gt;org.apache.derby.jdbc.EmbeddedDriver&lt;/log:option&gt;
+					&lt;log:option name=&quot;jdbcUser&quot;&gt;app&lt;/log:option&gt;
+					&lt;log:option name=&quot;userSelect&quot;&gt;select userid, password from users where userid=?&lt;/log:option&gt;
+					&lt;log:option name=&quot;groupSelect&quot;&gt;select userid, groupname from usergroups where userid=?&lt;/log:option&gt;
+					&lt;log:option name=&quot;jdbcURL&quot;&gt;jdbc:derby:TimeReportDB&lt;/log:option&gt;
 				&lt;/log:login-module&gt;
 			&lt;/log:login-config&gt;
 		&lt;/xml-reference&gt;
@@ -410,31 +422,31 @@ By default the given sample application 
 ]]></script>
 </div></div>
 
-<h2><a shape="rect" name="Webapplicationsecuritysample-Toolsused"></a>Tools used</h2>
+<h2 id="Webapplicationsecuritysample-Toolsused">Tools used</h2>
 <p>The tools used for developing and building the Time Reporting sample application are:</p>
 
-<h3><a shape="rect" name="Webapplicationsecuritysample-ApacheMaven2"></a>Apache Maven 2</h3>
+<h3 id="Webapplicationsecuritysample-ApacheMaven2">Apache Maven 2</h3>
 <p>Maven is a popular open source build tool for enterprise Java projects, designed to take much of the hard work out of the build process. Maven uses a declarative approach, where the project structure and contents are described, rather than the task-based approach used in Ant or in traditional make files, for example. This helps enforce company-wide development standards and reduces the time needed to write and maintain build scripts. The declarative, lifecycle-based approach used by Maven 1 is, for many, a radical departure from more traditional build techniques, and Maven 2 goes even further in this regard. Maven 2 can be download from the following URL:<br clear="none">
 <a shape="rect" class="external-link" href="http://maven.apache.org">http://maven.apache.org</a></p>
 
-<h1><a shape="rect" name="Webapplicationsecuritysample-Configuring%2CBuildingandDeployingtheSampleApplication"></a>Configuring, Building and Deploying the Sample Application <a shape="rect" name="Webapplicationsecuritysample-configure"></a></h1>
+<h1 id="Webapplicationsecuritysample-Configuring,BuildingandDeployingtheSampleApplicationconfigure">Configuring, Building and Deploying the Sample Application <span class="confluence-anchor-link" id="Webapplicationsecuritysample-configure"></span></h1>
 
 <p>Download the Time Reporting application from the following link:<br clear="none">
-<a shape="rect" href="web-application-security-sample.data/timereport_.zip?version=1&amp;modificationDate=1183017447000">Time Report</a></p>
+<a shape="rect" href="web-application-security-sample.data/timereport_.zip?version=1&amp;modificationDate=1183017447000&amp;api=v2">Time Report</a></p>
 
 <p>After extracting the zip file, the &lt;time_report&gt; directory is created.</p>
 
-<h2><a shape="rect" name="Webapplicationsecuritysample-SourceCode"></a>Source Code</h2>
+<h2 id="Webapplicationsecuritysample-SourceCode">Source Code</h2>
 
 <p>You can checkout the source code of this sample from SVN:</p>
 
 <p>svn checkout <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/timereport">http://svn.apache.org/repos/asf/geronimo/samples/trunk/samples/timereport</a></p>
 
-<h2><a shape="rect" name="Webapplicationsecuritysample-Configuring"></a>Configuring</h2>
+<h2 id="Webapplicationsecuritysample-Configuring">Configuring</h2>
 <p>Since Time Reporting application is going to use J2EE declarative security, user needs to create a database to hold the information and deploy the security realm.</p>
 
-<h3><a shape="rect" name="Webapplicationsecuritysample-CreateDatabasetoholdUserInformation"></a>Create Database to hold User Information</h3>
-<p>After starting Apache Geronimo server, log into the console and follow the given steps to create the <b>TimeReportDB</b> to hold user information for the application.</p>
+<h3 id="Webapplicationsecuritysample-CreateDatabasetoholdUserInformation">Create Database to hold User Information</h3>
+<p>After starting Apache Geronimo server, log into the console and follow the given steps to create the <strong>TimeReportDB</strong> to hold user information for the application.</p>
 
 <div class="preformatted panel" style="border-style: solid;border-width: 1px;"><div class="preformattedHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>TimeReportDB.sql</b></div><div class="preformattedContent panelContent">
 <pre>CREATE TABLE users(
@@ -461,32 +473,31 @@ INSERT INTO usergroups VALUES('mgm2', 'M
 </pre>
 </div></div>
 
-<ol><li>Select <b>DB Manager</b> link from the <b>Console Navigation</b> in the left.</li><li>Give the database name as <b>TimeReportDB</b> in the <b>Create DB</b> field and click <b>Create</b> button.</li><li>Select TimeReportDB to the <b>Use DB</b> field.</li><li>Open <b>TimeReportDB.sql</b> in the <b>time_report/config</b> directory.</li><li>Paste the content <b>TimeReportDB.sql</b> to the <b>SQL Commands</b> text area and press <b>Run SQL</b> button.</li></ol>
+<ol><li>Select <strong>DB Manager</strong> link from the <strong>Console Navigation</strong> in the left.</li><li>Give the database name as <strong>TimeReportDB</strong> in the <strong>Create DB</strong> field and click <strong>Create</strong> button.</li><li>Select TimeReportDB to the <strong>Use DB</strong> field.</li><li>Open <strong>TimeReportDB.sql</strong> in the <strong>time_report/config</strong> directory.</li><li>Paste the content <strong>TimeReportDB.sql</strong> to the <strong>SQL Commands</strong> text area and press <strong>Run SQL</strong> button.</li></ol>
 
 
-<h2><a shape="rect" name="Webapplicationsecuritysample-Building"></a>Building</h2>
-<p>Time Report application comes with an pom.xml to help users to build from source code. Open a command prompt window and navigate to the <b>timereport</b> directory and just give <b>mvn install site</b> command to build. This will create a <b>timereport-ear-2.0-SNAPSHOT.ear</b> under the <b>timereport</b> folder. Now, you are ready to deploy the Time Report application in the Geronimo Application server.</p>
+<h2 id="Webapplicationsecuritysample-Building">Building</h2>
+<p>Time Report application comes with an pom.xml to help users to build from source code. Open a command prompt window and navigate to the <strong>timereport</strong> directory and just give <strong>mvn install site</strong> command to build. This will create a <strong>timereport-ear-2.0-SNAPSHOT.ear</strong> under the <strong>timereport</strong> folder. Now, you are ready to deploy the Time Report application in the Geronimo Application server.</p>
 
-<h2><a shape="rect" name="Webapplicationsecuritysample-Deploying"></a>Deploying</h2>
+<h2 id="Webapplicationsecuritysample-Deploying">Deploying</h2>
 <p>Deploying the sample application is pretty straight forward, since we are using the Geronimo Console. </p>
-<ol><li>Scroll down to <b>Deploy New</b> from the <b>Console Navigation</b> panel.</li><li>Load <b>timereport-ear-2.0-SNAPSHOT.ear</b> from <b>time_report</b> folder in to the <b>Archive</b> input box.</li><li>Press <b>Install</b> button to deploy application in the server.</li></ol>
+<ol><li>Scroll down to <strong>Deploy New</strong> from the <strong>Console Navigation</strong> panel.</li><li>Load <strong>timereport-ear-2.0-SNAPSHOT.ear</strong> from <strong>time_report</strong> folder in to the <strong>Archive</strong> input box.</li><li>Press <strong>Install</strong> button to deploy application in the server.</li></ol>
 
 
 <p><a shape="rect" href="#Webapplicationsecuritysample-top">Back to Top</a></p>
 
-<h1><a shape="rect" name="Webapplicationsecuritysample-TestingoftheSampleApplication"></a>Testing of the Sample Application <a shape="rect" name="Webapplicationsecuritysample-testing"></a></h1>
+<h1 id="Webapplicationsecuritysample-TestingoftheSampleApplicationtesting">Testing of the Sample Application <span class="confluence-anchor-link" id="Webapplicationsecuritysample-testing"></span></h1>
 
 <p>To test the sample application open a browser and type <a shape="rect" class="external-link" href="http://localhost:8080/timereport" rel="nofollow">http://localhost:8080/timereport</a>. It will forward to the Welcome page of the application.</p>
 
-<p>User can access Time Report page providing username as <b>emp1</b> and password with <b>pass1</b>. To login to the application as a Manager provide <b>mgm1</b> and <b>pass3</b> credentials.</p>
+<p>User can access Time Report page providing username as <strong>emp1</strong> and password with <strong>pass1</strong>. To login to the application as a Manager provide <strong>mgm1</strong> and <strong>pass3</strong> credentials.</p>
 
-<h1><a shape="rect" name="Webapplicationsecuritysample-Summary"></a>Summary <a shape="rect" name="Webapplicationsecuritysample-summary"></a></h1>
+<h1 id="Webapplicationsecuritysample-Summarysummary">Summary <span class="confluence-anchor-link" id="Webapplicationsecuritysample-summary"></span></h1>
 
 <p>This article has shown you how to deploy web application in to the Geronimo Application server with J2EE declarative security features. You followed step-by-step instructions to build, deploy and test the sample application.</p>
 
 <p>Some highlights of the article are:-</p>
-<ul><li>Apache Geronimo provides two different web containers namely Jetty and Tomcat.</li><li>Create a database to hold security data with built-in Derby.</li><li>Define security roles in Geronimo Web applications.</li><li>Deploy deployment plans and web archives using the Geronimo Console.</li></ul>
-</div>
+<ul><li>Apache Geronimo provides two different web containers namely Jetty and Tomcat.</li><li>Create a database to hold security data with built-in Derby.</li><li>Define security roles in Geronimo Web applications.</li><li>Deploy deployment plans and web archives using the Geronimo Console.</li></ul></div>
         </div>
 
         

Modified: websites/production/geronimo/content/GMOxDOC20/whats-new-in-geronimo-v2-m2.html
==============================================================================
--- websites/production/geronimo/content/GMOxDOC20/whats-new-in-geronimo-v2-m2.html (original)
+++ websites/production/geronimo/content/GMOxDOC20/whats-new-in-geronimo-v2-m2.html Tue Jul 29 00:52:18 2014
@@ -18,6 +18,17 @@
 
     <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
 
+  <link href='http://geronimo.apache.org/resources/highlighter/styles/shCoreGeronimo.css' rel='stylesheet' type='text/css' />
+  <link href='http://geronimo.apache.org/resources/highlighter/styles/shThemeGeronimo.css' rel='stylesheet' type='text/css' />
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  <script src='http://geronimo.apache.org/resources/highlighter/scripts/shBrushPlain.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
 
     <title>Apache Geronimo v2.0 Documentation : What's new in Geronimo v2-M2</title>
 
@@ -85,21 +96,32 @@
 
       <div class="pagecontent">
         <div class="wiki-content">
-          <div class="wiki-content maincontent"><style type="text/css">/*<![CDATA[*/
-table.ScrollbarTable  {border: none;padding: 3px;width: 100%;padding: 3px;margin: 0px;background-color: #f0f0f0}
-table.ScrollbarTable td.ScrollbarPrevIcon {text-align: center;width: 16px;border: none;}
-table.ScrollbarTable td.ScrollbarPrevName {text-align: left;border: none;}
-table.ScrollbarTable td.ScrollbarParent {text-align: center;border: none;}
-table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
-table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
+          <div class="wiki-content maincontent">    
+<div class="atb-scrollbar-macro">
+    <div class="prev">
+        <a shape="rect" href="release-notes-20-m6txt.html" rel="prev">
+                                    <span class="aui-icon aui-icon-small atb-icon-arrow-left">Previous</span>
+                                <span class="title">RELEASE-NOTES-2.0-M6.TXT</span>
+            </a>
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="release-notes-20-m6txt.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="release-notes-20-m6txt.html">RELEASE-NOTES-2.0-M6.TXT</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="release-notes-201txt.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="release-notes-201txt.html">RELEASE-NOTES-2.0.1.TXT</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;</td></tr></table></div>
+    </div>
+    <div class="parent">
+                    <a shape="rect" href="release-notes-201txt.html" rel="parent">
+                                            <span class="aui-icon aui-icon-small atb-icon-arrow-up">Up</span>
+                                        <span class="title">RELEASE-NOTES-2.0.1.TXT</span>
+                </a>
+
+            </div>
+    <div class="next">
+        
+    </div>
+</div>
 <p>This section provides a quick overview of the are several additions and fixes included in this milestone release.</p>
 
-<h1><a shape="rect" name="What%27snewinGeronimov2-M2-Moreintegration"></a>More integration</h1>
+<h1 id="What'snewinGeronimov2-M2-Moreintegration">More integration</h1>
 <p>With Apache Geronimo you get to choose the Web container (Tomcat or Jetty), the Web services implementation (Axis2 or CXF) and the persistence framework (OpenJPA or Cayene).</p>
 
-<h1><a shape="rect" name="What%27snewinGeronimov2-M2-EJB3"></a>EJB 3</h1>
+<h1 id="What'snewinGeronimov2-M2-EJB3">EJB 3</h1>
 <p>One of the major additions in this new milestone release is the initial integration of EJB 3 (JSR220) through the <a shape="rect" class="external-link" href="http://cwiki.apache.org/OPENEJB/">Apache OpenEJB</a> project. The EJB 3 specification now offers a totally redesigned Enterprise JavaBeans architecture, reduced complexity and simplified APIs to make the enterprise application development easier. </p>
 
 <p>Some remarks about this new specification are:</p>
@@ -109,11 +131,11 @@ table.ScrollbarTable td.ScrollbarNextIco
 
 <p>Refer to the <a shape="rect" class="external-link" href="http://jcp.org/en/jsr/detail?id=220" rel="nofollow">JSR 220: Enterprise JavaBeans <sup>TM</sup> 3.0 Specification Request</a> for further details.</p>
 
-<h2><a shape="rect" name="What%27snewinGeronimov2-M2-IntegrationinGeronimo"></a>Integration in Geronimo</h2>
+<h2 id="What'snewinGeronimov2-M2-IntegrationinGeronimo">Integration in Geronimo</h2>
 <p>As mentioned earlier, this specification makes it to Geronimo via the Apache OpenEJB project. The current development status of the OpenEJB project can be seen at <a shape="rect" class="external-link" href="http://incubator.apache.org/openejb/openejb-3-roadmap.html">OpenEJB 3 RoadMap</a> page.</p>
 
 
-<h1><a shape="rect" name="What%27snewinGeronimov2-M2-WebServicesTechnologies"></a>Web Services Technologies</h1>
+<h1 id="What'snewinGeronimov2-M2-WebServicesTechnologies">Web Services Technologies</h1>
 
 <p>The following Web Services technologies have been integrated in this milestone release:</p>
 

Modified: websites/production/geronimo/content/cache/GMOxDOC20.pageCache
==============================================================================
Binary files - no diff available.



Mime
View raw message