svn commit: r828601 - in /websites/production/cxf/content: cache/main.pageCache fediz-idp.html

[bu...@apache.org]

Author: buildbot
Date: Fri Aug 10 23:47:24 2012
New Revision: 828601

Log:
Production update by buildbot for cxf

Modified:
    websites/production/cxf/content/cache/main.pageCache
    websites/production/cxf/content/fediz-idp.html

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

Modified: websites/production/cxf/content/fediz-idp.html
==============================================================================
--- websites/production/cxf/content/fediz-idp.html (original)
+++ websites/production/cxf/content/fediz-idp.html Fri Aug 10 23:47:24 2012
@@ -166,23 +166,33 @@ $CATALINA_HOME/bin/shutdown.sh
 </pre>
 </div></div>
 
-<p>If you're using the one Tomcat with multiple instance option, it's $CATALINA_BASE that will need to be redefined.</p>
+<p>If you're using the one Tomcat with multiple instance option, it's $CATALINA_BASE instead that will need to be redefined above.</p>
 
-<p>The Fediz examples use the following TCP ports for the IDP/STS:</p>
+<h5><a shape="rect" name="FedizIDP-Tomcatserver.xmlconfiguration"></a>Tomcat server.xml configuration</h5>
 
-<ul><li>HTTP port: 9080 (used for Maven deployment, mvn tomcat:redeploy)</li><li>HTTPS port: 9443 (where IDP and STS are accessed)</li></ul>
+<p>The Fediz examples use the following Tomcat port values for the IDP/STS, defined in the conf/server.xml file.  We use ports different from the Tomcat defaults so as not to conflict with the Tomcat instance running the RP applications.</p>
 
+<ul><li>HTTP port: 9080 (used for Maven deployment, mvn tomcat:redeploy)</li><li>HTTPS port: 9443 (where IDP and STS are accessed)</li><li>Server port (for shutdown and other commands): 9005</li></ul>
 
-<p>The Tomcat HTTP(s) configuration is done in conf/server.xml.</p>
 
-<p>This is a sample snippet for an HTTPS configuration:</p>
+<p>Here is a sample snippet for showing the configuration of the above three values:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml">
+<span class="code-tag">&lt;Server port=<span class="code-quote">"9005"</span> shutdown=<span class="code-quote">"SHUTDOWN"</span>&gt;</span>
+
+    <span class="code-tag"><span class="code-comment">&lt;!-- http configuration --&gt;</span></span>
+    &lt;Connector port=<span class="code-quote">"9080"</span> protocol=<span class="code-quote">"HTTP/1.1"</span>
+               connectionTimeout=<span class="code-quote">"20000"</span>
+               redirectPort=<span class="code-quote">"9443"</span> /&gt;
+    ...
+    <span class="code-tag"><span class="code-comment">&lt;!-- https configuration --&gt;</span></span>
     &lt;Connector port=<span class="code-quote">"9443"</span> protocol=<span class="code-quote">"HTTP/1.1"</span> SSLEnabled=<span class="code-quote">"true"</span>
                maxThreads=<span class="code-quote">"150"</span> scheme=<span class="code-quote">"https"</span> secure=<span class="code-quote">"true"</span>
                keystoreFile=<span class="code-quote">"tomcat-idp.jks"</span>
                keystorePass=<span class="code-quote">"tompass"</span> sslProtocol=<span class="code-quote">"TLS"</span> /&gt;
+    ...
+<span class="code-tag">&lt;/Server&gt;</span>
 </pre>
 </div></div>