Author: dumindu
Date: Tue Dec 11 03:06:08 2007
New Revision: 10952

Log:

Sync with the 1.0 branch



Modified:
   
trunk/solutions/identity/modules/documentation/src/site/xdoc/mod_cspace_config.xml
   trunk/solutions/identity/modules/documentation/src/site/xdoc/php.xml
   trunk/solutions/identity/modules/mod-cspace/MOD_CSPACE_GUIDE

Modified: 
trunk/solutions/identity/modules/documentation/src/site/xdoc/mod_cspace_config.xml
==============================================================================
--- 
trunk/solutions/identity/modules/documentation/src/site/xdoc/mod_cspace_config.xml
  (original)
+++ 
trunk/solutions/identity/modules/documentation/src/site/xdoc/mod_cspace_config.xml
  Tue Dec 11 03:06:08 2007
@@ -27,22 +27,11 @@
                     it is used in.</p>
      <ul>
       <li> This directive takes no arguments.</li>
+      <li> This is the only required directive for enabling CardSpace 
authenticaton.</li>
      </ul>
     </td>
    </tr>
    <tr>
-    <td>CardSpaceTVS</td>
-    <td>
-     <p>URL of the token verificaton service.
-                    <ul>
-       <li>This service is installed with WSO2 Identity Solution,
-                   and can be found by default at 
-                   
http://localhost:12080/wsas/services/RelyingPartyService</li>
-      </ul>
-     </p>
-    </td>
-   </tr>
-   <tr>
     <td>SSLCertificateKeyFile </td>
     <td>
      <p> Path to the key file used to provide HTTPS.
@@ -69,6 +58,13 @@
     </td>
    </tr>
    <tr>
+    <td>CardSpaceCAFile </td>
+    <td>
+     <p>Path to the Certificate Authority certificate file of the identity 
providers
+     </p>
+    </td>
+   </tr>
+   <tr>
     <td>CardSpaceSessionManage </td>
     <td>
      <p> Specifies if session management should be handled 

Modified: trunk/solutions/identity/modules/documentation/src/site/xdoc/php.xml
==============================================================================
--- trunk/solutions/identity/modules/documentation/src/site/xdoc/php.xml        
(original)
+++ trunk/solutions/identity/modules/documentation/src/site/xdoc/php.xml        
Tue Dec 11 03:06:08 2007
@@ -28,10 +28,10 @@
   <p>This sample demonstrate how the relying party Apache2 module (mod_cspace) 
can be used to enable CardSpace authentication on a PHP web application.</p>
   <p>Requirements:</p>
   <ul>
-   <li>Apache2 Web Server (2.2.X or better) </li>
-   <li>OpenSSL (0.9.8c or better) </li>
-   <li>PHP (5.x) </li>
-   <li>JDK 1.5</li>
+      <li>Apache2 Web Server (2.2.X or better) </li>
+      <li>libxml2 (2.6.20 or better)</li>
+      <li>libxmlsec1 (1.2.0  or better)</li>
+      <li>PHP (5.x) </li>
   </ul>
   <h2>Please follow the instructions listed below:</h2>
   <h3>Step 1: Setting up Apache2 Web Server with SSL/TLS and PHP</h3>
@@ -51,25 +51,18 @@
   <pre>SSLCertificateFile /usr/local/apache2/conf/keys/server.crt
 SSLCertificateKeyFile /usr/local/apache2/conf/keys/server.key
 SSLCACertificateFile /usr/local/apache2/conf/keys/cacert.crt</pre>
-  <h3>Step 2: Running the Token Verifier Service </h3>
-  <p>Please follow the Identity Provider installation guide and install the 
Token Verifier Service. Since the Identity Provider by default adds the 
localhost as a globally trusted relying party, no configuration is necessary 
there. (Please see the <a href="idp_production.html">Identity Provider 
documentation</a> for more information)</p>
-  <h3>Step 3: Installing the CardSpace Module and the Sample Web 
Application</h3>
-  <p>Copy <code>mod_cspace.so</code> file provided with the distribution to 
the modules directory of your apache installation. (usually 
<code>/usr/lib/apache2/modules/)</code>
+  <h3>Step 2: Installing the CardSpace Module and the Sample Web 
Application</h3>
+  <p>If you built mod_cspace using the source distribution, copy 
<code>libmod_cspace.so</code> file inside the <code>.libs</code> directory to 
the modules directory of your apache installation as 
<code>mod_cspace.so</code>. (<code>/usr/lib/apache2/modules/</code> is the 
modules directory of a typical apache2 installation)</p>
+  <p>In addition, you may install the module using the packages provided (.deb 
and .rpm), if you happen to be on one of the supported platforms.
   </p>
   <p>Copy <code>php-sample</code> directory to the document root of your 
Apache2 installation.</p>
-  <p>Set the environment variable <code>WSFC_HOME</code> to point to the 
<code>wsf-c</code> directory inside the package extracted (i.e., the package 
which contained this sample).</p>
-  <p>Set the environment variable <code>LD_LIBRARY_PATH</code> to include the 
<code>wsf-c/lib</code> directory as well.</p>
-  <p>For instance if your current working directory is where you have 
extracted the identity solution package:</p>
-  <pre>% export WSFC_HOME = `pwd`/wsfc-id
-% export LD_LIBRARY_PATH = ${WSFC_HOME}/lib</pre>
-  <h3>Step 4: Configuring Apache2 (<code>httpd.conf</code>)</h3>
+  <h3>Step 3: Configuring Apache2 (<code>httpd.conf</code>)</h3>
   <p>Following configuration should be done in your <code>httpd.conf</code> 
file of the Apache 2 installation. Assuming that you have copied the 
<code>php-sample</code> to the document root of your Apache2 installation, the 
configuration in your <code>httpd.conf</code> should be as follows: 
 </p>
   <pre>LoadModule cspace_module modules/mod_cspace.so
 
 &lt;Location /php-sample/&gt;
     UseCardSpaceAuth
-    CardSpaceTVS http://localhost:12080/wsas/services/RelyingPartyService
 &lt;/Location&gt;</pre>
   <strong>IMPORTANT:</strong>
   <ul>
@@ -77,7 +70,7 @@
    <li>Since you have already configured SSL/TLS, using mod_ssl, 
<code>SSLCertificateKeyFile</code> directive should be already in the 
<code>httpd.conf</code> file.</li>
    <li>For further information on the configuration derectives that can be 
used with mod_cspace please refer to the <a 
href="mod_cspace-config.html">module configuration guide</a>.</li>
   </ul>
-  <h3>Step 5: Run Apache2 server and try logging in to the web app</h3>
+  <h3>Step 4: Run Apache2 server and try to login to the web app</h3>
   <p>Point your browser to the location you have installed the web 
application. If you followed this guide properly, it will be <a 
href="https://localhost/php-sample/";>https://localhost/php-sample/</a>.</p>
   <p>Now you can try out the sample PHP web application.</p>
   <strong>IMPORTANT:</strong>

Modified: trunk/solutions/identity/modules/mod-cspace/MOD_CSPACE_GUIDE
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/MOD_CSPACE_GUIDE        
(original)
+++ trunk/solutions/identity/modules/mod-cspace/MOD_CSPACE_GUIDE        Tue Dec 
11 03:06:08 2007
@@ -22,6 +22,9 @@
                         * Only applicable for Apache 2.0.x 
                           (see SSLCertificateKeyFile above)
 
+  CardSpaceCAFile - Path to the Certificate Authority certificate file of the
+                    identity providers
+
   CardSpaceSessionManage - Specifies if session management should be handled 
                            by the module.
                            * Set this directive "on" if the session management

_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev

Reply via email to