18 files changed, 88 insertions, 3 deletions
diff --git a/sca-cpp/trunk/test/Makefile.am b/sca-cpp/trunk/test/Makefile.am
index c5af4bb5bb..76b761c4c8 100644
--- a/sca-cpp/trunk/test/Makefile.am
+++ b/sca-cpp/trunk/test/Makefile.am
@@ -15,5 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = store-scheme store-cpp store-python store-java store-wsgi store-sql
+SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql
 
diff --git a/sca-cpp/trunk/test/store-wsgi/Makefile.am b/sca-cpp/trunk/test/store-gae/Makefile.am
index 56015e7f19..bb39293d21 100644
--- a/sca-cpp/trunk/test/store-wsgi/Makefile.am
+++ b/sca-cpp/trunk/test/store-gae/Makefile.am
@@ -16,6 +16,7 @@
 #  under the License.
 
 if WANT_PYTHON
+if WANT_GAE
 
 noinst_DATA = target.stamp 
 
@@ -28,6 +29,7 @@ target.stamp: app.yaml *.py *.composite $(top_builddir)/modules/wsgi/*.py htdocs
 clean-local:
 	rm -rf target.stamp target
 
-#TESTS = server-test
+TESTS = server-test
 
 endif
+endif
diff --git a/sca-cpp/trunk/test/store-wsgi/app.yaml b/sca-cpp/trunk/test/store-gae/app.yaml
index e5807c233a..e5807c233a 100644
--- a/sca-cpp/trunk/test/store-wsgi/app.yaml
+++ b/sca-cpp/trunk/test/store-gae/app.yaml
diff --git a/sca-cpp/trunk/test/store-wsgi/currency-converter.py b/sca-cpp/trunk/test/store-gae/currency-converter.py
index 2fded8f616..2fded8f616 100644
--- a/sca-cpp/trunk/test/store-wsgi/currency-converter.py
+++ b/sca-cpp/trunk/test/store-gae/currency-converter.py
diff --git a/sca-cpp/trunk/test/store-wsgi/domain-backend.composite b/sca-cpp/trunk/test/store-gae/domain-backend.composite
index a543b9a6b5..a543b9a6b5 100644
--- a/sca-cpp/trunk/test/store-wsgi/domain-backend.composite
+++ b/sca-cpp/trunk/test/store-gae/domain-backend.composite
diff --git a/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite b/sca-cpp/trunk/test/store-gae/domain-frontend.composite
index a183c84a76..a183c84a76 100644
--- a/sca-cpp/trunk/test/store-wsgi/domain-frontend.composite
+++ b/sca-cpp/trunk/test/store-gae/domain-frontend.composite
diff --git a/sca-cpp/trunk/test/store-wsgi/domain-single.composite b/sca-cpp/trunk/test/store-gae/domain-single.composite
index 41ce77bedd..41ce77bedd 100644
--- a/sca-cpp/trunk/test/store-wsgi/domain-single.composite
+++ b/sca-cpp/trunk/test/store-gae/domain-single.composite
diff --git a/sca-cpp/trunk/test/store-wsgi/domain.composite b/sca-cpp/trunk/test/store-gae/domain.composite
index 41ce77bedd..41ce77bedd 100644
--- a/sca-cpp/trunk/test/store-wsgi/domain.composite
+++ b/sca-cpp/trunk/test/store-gae/domain.composite
diff --git a/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py b/sca-cpp/trunk/test/store-gae/fruits-catalog.py
index 75c18f5f99..75c18f5f99 100644
--- a/sca-cpp/trunk/test/store-wsgi/fruits-catalog.py
+++ b/sca-cpp/trunk/test/store-gae/fruits-catalog.py
diff --git a/sca-cpp/trunk/test/store-wsgi/gmemcache.py b/sca-cpp/trunk/test/store-gae/gmemcache.py
index 83dffa9339..61f1dc3486 100644
--- a/sca-cpp/trunk/test/store-wsgi/gmemcache.py
+++ b/sca-cpp/trunk/test/store-gae/gmemcache.py
@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-# Memcached based cache implementation
+# Google AppEngine Memcached based cache implementation
 import uuid
 from google.appengine.api import memcache
 
diff --git a/sca-cpp/trunk/test/store-wsgi/htdocs/store.html b/sca-cpp/trunk/test/store-gae/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-wsgi/htdocs/store.html
+++ b/sca-cpp/trunk/test/store-gae/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-wsgi/htdocs/store.js b/sca-cpp/trunk/test/store-gae/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-wsgi/htdocs/store.js
+++ b/sca-cpp/trunk/test/store-gae/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-wsgi/htpasswd.py b/sca-cpp/trunk/test/store-gae/htpasswd.py
index 75d94f58b6..75d94f58b6 100644
--- a/sca-cpp/trunk/test/store-wsgi/htpasswd.py
+++ b/sca-cpp/trunk/test/store-gae/htpasswd.py
diff --git a/sca-cpp/trunk/test/store-gae/server-test b/sca-cpp/trunk/test/store-gae/server-test
new file mode 100755
index 0000000000..c656cb33c2
--- /dev/null
+++ b/sca-cpp/trunk/test/store-gae/server-test
@@ -0,0 +1,41 @@
+#!/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.
+
+echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
+
+# Setup
+./start 2>/dev/null
+sleep 2
+
+# Test HTTP GET
+mkdir -p tmp
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+diff tmp/store.html htdocs/store.html
+rc=$?
+
+# Cleanup
+./stop
+sleep 2
+
+if [ "$rc" = "0" ]; then
+    echo "OK"
+fi
+return $rc
diff --git a/sca-cpp/trunk/test/store-wsgi/shopping-cart.py b/sca-cpp/trunk/test/store-gae/shopping-cart.py
index c520da4303..c520da4303 100644
--- a/sca-cpp/trunk/test/store-wsgi/shopping-cart.py
+++ b/sca-cpp/trunk/test/store-gae/shopping-cart.py
diff --git a/sca-cpp/trunk/test/store-gae/start b/sca-cpp/trunk/test/store-gae/start
new file mode 100755
index 0000000000..3c9644e656
--- /dev/null
+++ b/sca-cpp/trunk/test/store-gae/start
@@ -0,0 +1,21 @@
+#!/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.
+
+../../modules/wsgi/gae-start target 8090
+
diff --git a/sca-cpp/trunk/test/store-gae/stop b/sca-cpp/trunk/test/store-gae/stop
new file mode 100755
index 0000000000..7c8a7e5551
--- /dev/null
+++ b/sca-cpp/trunk/test/store-gae/stop
@@ -0,0 +1,21 @@
+#!/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.
+
+../../modules/wsgi/gae-stop target 8090
+
diff --git a/sca-cpp/trunk/test/store-wsgi/store.py b/sca-cpp/trunk/test/store-gae/store.py
index 35c0f5b2aa..35c0f5b2aa 100644
--- a/sca-cpp/trunk/test/store-wsgi/store.py
+++ b/sca-cpp/trunk/test/store-gae/store.py