4 files changed, 42 insertions, 1 deletions
diff --git a/sca-cpp/trunk/modules/openid/Makefile.am b/sca-cpp/trunk/modules/openid/Makefile.am
index 158dd8902b..a613f2ef78 100644
--- a/sca-cpp/trunk/modules/openid/Makefile.am
+++ b/sca-cpp/trunk/modules/openid/Makefile.am
@@ -18,7 +18,7 @@
 
 if WANT_OPENID
 
-dist_mod_SCRIPTS = openid-conf openid-step2-conf
+dist_mod_SCRIPTS = openid-conf openid-step2-conf openid-memcached-conf
 moddir = $(prefix)/modules/openid
 
 mod_DATA = openid.prefix
diff --git a/sca-cpp/trunk/modules/openid/openid-memcached-conf b/sca-cpp/trunk/modules/openid/openid-memcached-conf
new file mode 100755
index 0000000000..1dfbd3b502
--- /dev/null
+++ b/sca-cpp/trunk/modules/openid/openid-memcached-conf
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+#  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.
+
+here=`readlink -f $0`; here=`dirname $here`
+mkdir -p $1
+root=`readlink -f $1`
+host=$2
+port=$3
+
+# Configure HTTPD mod_auth_openid module cache
+cat >>$root/conf/httpd.conf <<EOF
+# Generated by: openid-cache-conf $*
+AuthOpenIDMemcached $host:$port
+
+EOF
+
diff --git a/sca-cpp/trunk/modules/openid/start-test b/sca-cpp/trunk/modules/openid/start-test
index 67020cf701..55e7a13f26 100755
--- a/sca-cpp/trunk/modules/openid/start-test
+++ b/sca-cpp/trunk/modules/openid/start-test
@@ -18,12 +18,19 @@
 #  under the License.
 
 # Setup
+../../components/cache/memcached-start 11212
+../../components/cache/memcached-start 11213
+
 ../../modules/http/ssl-ca-conf tmp localhost
 ../../modules/http/ssl-cert-conf tmp localhost
 ../../modules/http/httpd-conf tmp localhost 8090 htdocs
 ../../modules/http/httpd-ssl-conf tmp 8453
+
 ./openid-conf tmp
+./openid-memcached-conf tmp localhost 11212
+./openid-memcached-conf tmp localhost 11213
 ./openid-step2-conf tmp
+
 ../../modules/server/server-conf tmp
 ../../modules/server/scheme-conf tmp
 cat >>tmp/conf/httpd.conf <<EOF
diff --git a/sca-cpp/trunk/modules/openid/stop-test b/sca-cpp/trunk/modules/openid/stop-test
index a468b0f407..a0587f8cb7 100755
--- a/sca-cpp/trunk/modules/openid/stop-test
+++ b/sca-cpp/trunk/modules/openid/stop-test
@@ -20,3 +20,5 @@
 # Cleanup
 ../../modules/http/httpd-stop tmp
 
+../../components/cache/memcached-stop 11212
+../../components/cache/memcached-stop 11213