5 files changed, 75 insertions, 11 deletions
diff --git a/sca-cpp/trunk/modules/openid/htdocs/index.html b/sca-cpp/trunk/modules/openid/htdocs/index.html
index 5681f551ca..ff69115cda 100644
--- a/sca-cpp/trunk/modules/openid/htdocs/index.html
+++ b/sca-cpp/trunk/modules/openid/htdocs/index.html
@@ -17,5 +17,8 @@
    under the License.
 -->
 
-<html><body><h1>Unprotected area - It works!</h1></body></html>
-
+<html><body>
+<h1>Unprotected area - It works!</h1>
+<p><a href="protected">Protected area</a></p>
+<p><a href="login.html">Sign in</a></p>
+</body></html>
diff --git a/sca-cpp/trunk/modules/openid/htdocs/login/index.html b/sca-cpp/trunk/modules/openid/htdocs/login.html
index 6270c7efbd..b7b87aac04 100644
--- a/sca-cpp/trunk/modules/openid/htdocs/login/index.html
+++ b/sca-cpp/trunk/modules/openid/htdocs/login.html
@@ -18,21 +18,45 @@
 -->
 
 <html><body>
-<h1>Sign in using an OpenID provider</h1>
-<form action="/protected" method="GET">
+<h1>Sign in with an OpenID provider</h1>
+
+<form "googleSignin" action="/protected" method="GET">
 <input type="hidden" name="openid_identifier" value="https://www.google.com/accounts/o8/id"/>
 <input type="submit" value="Sign in with your Google account"/>
 </form>
-<form action="/protected" method="GET">
+
+<form name="yahooSignin" action="/protected" method="GET">
 <input type="hidden" name="openid_identifier" value="https://me.yahoo.com/"/>
 <input type="submit" value="Sign in with your Yahoo account"/>
+
 </form>
-<form action="/protected" method="GET">
-<input type="hidden" name="openid_identifier" value="https://me.myopenid.com"/>
+
+<form name="myOpenIDSignin" action="/protected" method="GET">
+<input type="hidden" name="openid_identifier" value="http://www.myopenid.com/xrds"/>
 <input type="submit" value="Sign in with your MyOpenID account"/>
 </form>
-<form action="/protected" method="GET">
+
+<form name="verisignSignin" action="/protected" method="GET">
 <input type="hidden" name="openid_identifier" value="https://pip.verisignlabs.com/"/>
 <input type="submit" value="Sign in with your Verisign account"/>
 </form>
+
+<form name="googleAppsSignin" action="/protected" method="GET">
+<script type="text/javascript">
+function initOpenIDIdentifier() {
+    document.googleAppsSignin.openid_identifier.value = 'https://www.google.com/accounts/o8/site-xrds?ns=2&hd=' + document.googleAppsSignin.domain.value;
+    return true;
+}
+</script>
+<!-- Enter your Google apps domain, e.g example.com -->
+<input type="text" size="20" name="domain" value="example.com"/><br/>
+<input type="hidden" size=50 name="openid_identifier" value=""/>
+<input type="submit" onclick="initOpenIDIdentifier()" value="Sign in with a Google Apps domain"/>
+</form>
+
+<form name="xrdsEndpointSignin" action="/protected" method="GET">
+<!-- Enter your OpenID XRDS endpoint, e.g. https://www.google.com/accounts/o8/id -->
+<input type="text" size="50" name="openid_identifier" value="https://www.google.com/accounts/o8/id"/><br/>
+<input type="submit" value="Sign in with an OpenID XRDS endpoint"/>
+</form>
 </body></html>
diff --git a/sca-cpp/trunk/modules/openid/htdocs/protected/index.html b/sca-cpp/trunk/modules/openid/htdocs/protected/index.html
index 3483c300a8..1799bc1006 100644
--- a/sca-cpp/trunk/modules/openid/htdocs/protected/index.html
+++ b/sca-cpp/trunk/modules/openid/htdocs/protected/index.html
@@ -17,5 +17,8 @@
    under the License.
 -->
 
-<html><body><h1>Protected area - It works!</h1></body></html>
-
+<html><body>
+<h1>Protected area - It works!</h1>
+<p><a href="hello">Hello component</a></p>
+<p><a href="logout.html">Sign out</a></p>
+</body></html>
diff --git a/sca-cpp/trunk/modules/openid/htdocs/protected/logout.html b/sca-cpp/trunk/modules/openid/htdocs/protected/logout.html
new file mode 100644
index 0000000000..ec8c104c92
--- /dev/null
+++ b/sca-cpp/trunk/modules/openid/htdocs/protected/logout.html
@@ -0,0 +1,34 @@
+<!--
+   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
+   "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
+   "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.
+-->
+
+<html><body>
+<h1>Sign out</h1>
+
+<form "Signout" action="/" method="GET">
+<script type="text/javascript">
+function deleteOpenIDSessionCookie() {
+    alert(document.cookie);
+    document.cookie = 'open_id_session_id=;expires=' + new Date(1970,01,01).toGMTString();
+    alert(document.cookie);
+    return true;
+}
+</script>
+<input type="submit" onclick="deleteOpenIDSessionCookie()" value="Sign out"/>
+</form>
+</body></html>
diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf
index b5d2994dcc..cac75549fd 100755
--- a/sca-cpp/trunk/modules/openid/openid-conf
+++ b/sca-cpp/trunk/modules/openid/openid-conf
@@ -30,7 +30,7 @@ LoadModule authopenid_module  $openid_prefix/modules/mod_auth_openid.so
 
 <Location /protected>
 AuthOpenIDEnabled On
-AuthOpenIDLoginPage /login
+AuthOpenIDLoginPage /login.html
 AuthOpenIDAXAdd EMAIL http://axschema.org/contact/email
 </Location>