101 files changed, 13 insertions, 35 deletions
diff --git a/sca-cpp/trunk/Makefile.am b/sca-cpp/trunk/Makefile.am
index 3ca481b75c..57c708912f 100644
--- a/sca-cpp/trunk/Makefile.am
+++ b/sca-cpp/trunk/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = kernel modules components test doc samples
+SUBDIRS = kernel modules components doc samples
 
 datadir=$(prefix)
 data_DATA = INSTALL README LICENSE COPYING NOTICE
@@ -29,7 +29,6 @@ install-data-hook:
 	rm -f $(prefix)/doc/Makefile* $(prefix)/doc/Doxyfile*
 	rm -rf `find $(prefix)/doc -type d -name .svn`
 	rm -rf `find $(prefix)/doc -type d -name .deps`
-	rm -rf $(prefix)/test
 
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
@@ -39,7 +38,6 @@ bindist: install
 	rm -rf ${PACKAGE}-${PACKAGE_VERSION}-bin
 	mkdir ${PACKAGE}-${PACKAGE_VERSION}-bin
 	cp -r $(prefix)/* ${PACKAGE}-${PACKAGE_VERSION}-bin
-	rm -rf ${PACKAGE}-${PACKAGE_VERSION}-bin/test
 	tar -cf - ${PACKAGE}-${PACKAGE_VERSION}-bin | gzip -c > ${PACKAGE}-${PACKAGE_VERSION}-bin.tar.gz
 	rm -rf ${PACKAGE}-${PACKAGE_VERSION}-bin
 	
diff --git a/sca-cpp/trunk/README b/sca-cpp/trunk/README
index 720b785e47..f30b0f0df0 100644
--- a/sca-cpp/trunk/README
+++ b/sca-cpp/trunk/README
@@ -48,8 +48,6 @@ Here's a rough guide to the Tuscany SCA source tree:
  |   |   |-- store            Key/value persistent store
  |   |   |-- webservice       Web service gateway
  |   |
- |   |-- test                 Integration tests
- |   |
  |   |-- samples              Sample Applications
  |   |
  |   |-- ubuntu               Automated install on Ubuntu 9.10
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index abcc948dd3..c114410f0e 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -702,14 +702,13 @@ AC_CONFIG_FILES([Makefile
                  components/sqldb/Makefile
                  components/webservice/Makefile
                  samples/Makefile
-                 test/Makefile
-                 test/store-scheme/Makefile
-                 test/store-cpp/Makefile
-                 test/store-python/Makefile
-                 test/store-java/Makefile
-                 test/store-gae/Makefile
-                 test/store-sql/Makefile
-                 test/store-nosql/Makefile
+                 samples/store-scheme/Makefile
+                 samples/store-cpp/Makefile
+                 samples/store-python/Makefile
+                 samples/store-java/Makefile
+                 samples/store-gae/Makefile
+                 samples/store-sql/Makefile
+                 samples/store-nosql/Makefile
                  doc/Makefile
                  doc/Doxyfile
                  ])
diff --git a/sca-cpp/trunk/samples/Makefile.am b/sca-cpp/trunk/samples/Makefile.am
index de5c2d1b1e..a3e0cfa6b8 100644
--- a/sca-cpp/trunk/samples/Makefile.am
+++ b/sca-cpp/trunk/samples/Makefile.am
@@ -15,3 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql store-nosql
+
diff --git a/sca-cpp/trunk/test/store-cpp/Makefile.am b/sca-cpp/trunk/samples/store-cpp/Makefile.am
index 00d037cc97..f429166519 100644
--- a/sca-cpp/trunk/test/store-cpp/Makefile.am
+++ b/sca-cpp/trunk/samples/store-cpp/Makefile.am
@@ -15,8 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-test_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
-testdir = $(prefix)/test
+sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
+sampledir = $(prefix)/samples/store-cpp
 
 libcurrency_converter_la_SOURCES = currency-converter.cpp
 
diff --git a/sca-cpp/trunk/test/store-cpp/currency-converter.cpp b/sca-cpp/trunk/samples/store-cpp/currency-converter.cpp
index 5f0702490a..5f0702490a 100644
--- a/sca-cpp/trunk/test/store-cpp/currency-converter.cpp
+++ b/sca-cpp/trunk/samples/store-cpp/currency-converter.cpp
diff --git a/sca-cpp/trunk/test/store-cpp/fruits-catalog.cpp b/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp
index 20f2bd35f7..20f2bd35f7 100644
--- a/sca-cpp/trunk/test/store-cpp/fruits-catalog.cpp
+++ b/sca-cpp/trunk/samples/store-cpp/fruits-catalog.cpp
diff --git a/sca-cpp/trunk/test/store-cpp/htdocs/.htaccess b/sca-cpp/trunk/samples/store-cpp/htdocs/.htaccess
index e2e343b6b2..e2e343b6b2 100644
--- a/sca-cpp/trunk/test/store-cpp/htdocs/.htaccess
+++ b/sca-cpp/trunk/samples/store-cpp/htdocs/.htaccess
diff --git a/sca-cpp/trunk/test/store-cpp/htdocs/store.html b/sca-cpp/trunk/samples/store-cpp/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-cpp/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-cpp/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-cpp/htdocs/store.js b/sca-cpp/trunk/samples/store-cpp/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-cpp/htdocs/store.js
+++ b/sca-cpp/trunk/samples/store-cpp/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-cpp/server-test b/sca-cpp/trunk/samples/store-cpp/server-test
index d2013f6892..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-cpp/server-test
+++ b/sca-cpp/trunk/samples/store-cpp/server-test
diff --git a/sca-cpp/trunk/test/store-cpp/shopping-cart.cpp b/sca-cpp/trunk/samples/store-cpp/shopping-cart.cpp
index eaad0d3c77..eaad0d3c77 100644
--- a/sca-cpp/trunk/test/store-cpp/shopping-cart.cpp
+++ b/sca-cpp/trunk/samples/store-cpp/shopping-cart.cpp
diff --git a/sca-cpp/trunk/test/store-cpp/ssl-start b/sca-cpp/trunk/samples/store-cpp/ssl-start
index 9cb5b88974..9cb5b88974 100755
--- a/sca-cpp/trunk/test/store-cpp/ssl-start
+++ b/sca-cpp/trunk/samples/store-cpp/ssl-start
diff --git a/sca-cpp/trunk/test/store-cpp/start b/sca-cpp/trunk/samples/store-cpp/start
index 7b9c0d6379..7b9c0d6379 100755
--- a/sca-cpp/trunk/test/store-cpp/start
+++ b/sca-cpp/trunk/samples/store-cpp/start
diff --git a/sca-cpp/trunk/test/store-cpp/stop b/sca-cpp/trunk/samples/store-cpp/stop
index a59273b8ed..a59273b8ed 100755
--- a/sca-cpp/trunk/test/store-cpp/stop
+++ b/sca-cpp/trunk/samples/store-cpp/stop
diff --git a/sca-cpp/trunk/test/store-cpp/store.composite b/sca-cpp/trunk/samples/store-cpp/store.composite
index 056f7b4c68..056f7b4c68 100644
--- a/sca-cpp/trunk/test/store-cpp/store.composite
+++ b/sca-cpp/trunk/samples/store-cpp/store.composite
diff --git a/sca-cpp/trunk/test/store-gae/Makefile.am b/sca-cpp/trunk/samples/store-gae/Makefile.am
index bb39293d21..bb39293d21 100644
--- a/sca-cpp/trunk/test/store-gae/Makefile.am
+++ b/sca-cpp/trunk/samples/store-gae/Makefile.am
diff --git a/sca-cpp/trunk/test/store-gae/app.yaml b/sca-cpp/trunk/samples/store-gae/app.yaml
index e5807c233a..e5807c233a 100644
--- a/sca-cpp/trunk/test/store-gae/app.yaml
+++ b/sca-cpp/trunk/samples/store-gae/app.yaml
diff --git a/sca-cpp/trunk/test/store-gae/currency-converter.py b/sca-cpp/trunk/samples/store-gae/currency-converter.py
index 2fded8f616..2fded8f616 100644
--- a/sca-cpp/trunk/test/store-gae/currency-converter.py
+++ b/sca-cpp/trunk/samples/store-gae/currency-converter.py
diff --git a/sca-cpp/trunk/test/store-gae/domain-backend.composite b/sca-cpp/trunk/samples/store-gae/domain-backend.composite
index a543b9a6b5..a543b9a6b5 100644
--- a/sca-cpp/trunk/test/store-gae/domain-backend.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain-backend.composite
diff --git a/sca-cpp/trunk/test/store-gae/domain-frontend.composite b/sca-cpp/trunk/samples/store-gae/domain-frontend.composite
index a183c84a76..a183c84a76 100644
--- a/sca-cpp/trunk/test/store-gae/domain-frontend.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain-frontend.composite
diff --git a/sca-cpp/trunk/test/store-gae/domain-single.composite b/sca-cpp/trunk/samples/store-gae/domain-single.composite
index 41ce77bedd..41ce77bedd 100644
--- a/sca-cpp/trunk/test/store-gae/domain-single.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain-single.composite
diff --git a/sca-cpp/trunk/test/store-gae/domain.composite b/sca-cpp/trunk/samples/store-gae/domain.composite
index 41ce77bedd..41ce77bedd 100644
--- a/sca-cpp/trunk/test/store-gae/domain.composite
+++ b/sca-cpp/trunk/samples/store-gae/domain.composite
diff --git a/sca-cpp/trunk/test/store-gae/fruits-catalog.py b/sca-cpp/trunk/samples/store-gae/fruits-catalog.py
index 75c18f5f99..75c18f5f99 100644
--- a/sca-cpp/trunk/test/store-gae/fruits-catalog.py
+++ b/sca-cpp/trunk/samples/store-gae/fruits-catalog.py
diff --git a/sca-cpp/trunk/test/store-gae/gmemcache.py b/sca-cpp/trunk/samples/store-gae/gmemcache.py
index 61f1dc3486..61f1dc3486 100644
--- a/sca-cpp/trunk/test/store-gae/gmemcache.py
+++ b/sca-cpp/trunk/samples/store-gae/gmemcache.py
diff --git a/sca-cpp/trunk/test/store-gae/htdocs/store.html b/sca-cpp/trunk/samples/store-gae/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-gae/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-gae/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-gae/htdocs/store.js b/sca-cpp/trunk/samples/store-gae/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-gae/htdocs/store.js
+++ b/sca-cpp/trunk/samples/store-gae/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-gae/htpasswd.py b/sca-cpp/trunk/samples/store-gae/htpasswd.py
index 75d94f58b6..75d94f58b6 100644
--- a/sca-cpp/trunk/test/store-gae/htpasswd.py
+++ b/sca-cpp/trunk/samples/store-gae/htpasswd.py
diff --git a/sca-cpp/trunk/test/store-gae/server-test b/sca-cpp/trunk/samples/store-gae/server-test
index c656cb33c2..c656cb33c2 100755
--- a/sca-cpp/trunk/test/store-gae/server-test
+++ b/sca-cpp/trunk/samples/store-gae/server-test
diff --git a/sca-cpp/trunk/test/store-gae/shopping-cart.py b/sca-cpp/trunk/samples/store-gae/shopping-cart.py
index c520da4303..c520da4303 100644
--- a/sca-cpp/trunk/test/store-gae/shopping-cart.py
+++ b/sca-cpp/trunk/samples/store-gae/shopping-cart.py
diff --git a/sca-cpp/trunk/test/store-gae/start b/sca-cpp/trunk/samples/store-gae/start
index 3c9644e656..3c9644e656 100755
--- a/sca-cpp/trunk/test/store-gae/start
+++ b/sca-cpp/trunk/samples/store-gae/start
diff --git a/sca-cpp/trunk/test/store-gae/stop b/sca-cpp/trunk/samples/store-gae/stop
index 7c8a7e5551..7c8a7e5551 100755
--- a/sca-cpp/trunk/test/store-gae/stop
+++ b/sca-cpp/trunk/samples/store-gae/stop
diff --git a/sca-cpp/trunk/test/store-gae/store.py b/sca-cpp/trunk/samples/store-gae/store.py
index 35c0f5b2aa..35c0f5b2aa 100644
--- a/sca-cpp/trunk/test/store-gae/store.py
+++ b/sca-cpp/trunk/samples/store-gae/store.py
diff --git a/sca-cpp/trunk/test/store-java/Makefile.am b/sca-cpp/trunk/samples/store-java/Makefile.am
index 80972a0acc..d80aaabf0b 100644
--- a/sca-cpp/trunk/test/store-java/Makefile.am
+++ b/sca-cpp/trunk/samples/store-java/Makefile.am
@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-JAVAROOT = ${top_builddir}/test/store-java
+JAVAROOT = ${top_builddir}/samples/store-java
 
 if WANT_JAVA
 
diff --git a/sca-cpp/trunk/test/store-java/htdocs/.htaccess b/sca-cpp/trunk/samples/store-java/htdocs/.htaccess
index e2e343b6b2..e2e343b6b2 100644
--- a/sca-cpp/trunk/test/store-java/htdocs/.htaccess
+++ b/sca-cpp/trunk/samples/store-java/htdocs/.htaccess
diff --git a/sca-cpp/trunk/test/store-java/htdocs/store.html b/sca-cpp/trunk/samples/store-java/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-java/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-java/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-java/htdocs/store.js b/sca-cpp/trunk/samples/store-java/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-java/htdocs/store.js
+++ b/sca-cpp/trunk/samples/store-java/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-java/server-test b/sca-cpp/trunk/samples/store-java/server-test
index d2013f6892..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-java/server-test
+++ b/sca-cpp/trunk/samples/store-java/server-test
diff --git a/sca-cpp/trunk/test/store-java/ssl-start b/sca-cpp/trunk/samples/store-java/ssl-start
index ec44ba1ac0..ec44ba1ac0 100755
--- a/sca-cpp/trunk/test/store-java/ssl-start
+++ b/sca-cpp/trunk/samples/store-java/ssl-start
diff --git a/sca-cpp/trunk/test/store-java/start b/sca-cpp/trunk/samples/store-java/start
index c8146e9e46..c8146e9e46 100755
--- a/sca-cpp/trunk/test/store-java/start
+++ b/sca-cpp/trunk/samples/store-java/start
diff --git a/sca-cpp/trunk/test/store-java/stop b/sca-cpp/trunk/samples/store-java/stop
index 79d914e937..79d914e937 100755
--- a/sca-cpp/trunk/test/store-java/stop
+++ b/sca-cpp/trunk/samples/store-java/stop
diff --git a/sca-cpp/trunk/test/store-java/store.composite b/sca-cpp/trunk/samples/store-java/store.composite
index 8d733db134..8d733db134 100644
--- a/sca-cpp/trunk/test/store-java/store.composite
+++ b/sca-cpp/trunk/samples/store-java/store.composite
diff --git a/sca-cpp/trunk/test/store-java/store/CurrencyConverter.java b/sca-cpp/trunk/samples/store-java/store/CurrencyConverter.java
index 1ed15a670a..1ed15a670a 100644
--- a/sca-cpp/trunk/test/store-java/store/CurrencyConverter.java
+++ b/sca-cpp/trunk/samples/store-java/store/CurrencyConverter.java
diff --git a/sca-cpp/trunk/test/store-java/store/CurrencyConverterImpl.java b/sca-cpp/trunk/samples/store-java/store/CurrencyConverterImpl.java
index a6d0fd00b3..a6d0fd00b3 100644
--- a/sca-cpp/trunk/test/store-java/store/CurrencyConverterImpl.java
+++ b/sca-cpp/trunk/samples/store-java/store/CurrencyConverterImpl.java
diff --git a/sca-cpp/trunk/test/store-java/store/FruitsCatalogImpl.java b/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java
index 2904bbd8a1..2904bbd8a1 100644
--- a/sca-cpp/trunk/test/store-java/store/FruitsCatalogImpl.java
+++ b/sca-cpp/trunk/samples/store-java/store/FruitsCatalogImpl.java
diff --git a/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java b/sca-cpp/trunk/samples/store-java/store/ShoppingCartImpl.java
index 878e0cff49..878e0cff49 100644
--- a/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java
+++ b/sca-cpp/trunk/samples/store-java/store/ShoppingCartImpl.java
diff --git a/sca-cpp/trunk/test/store-nosql/Makefile.am b/sca-cpp/trunk/samples/store-nosql/Makefile.am
index 345e58d544..345e58d544 100644
--- a/sca-cpp/trunk/test/store-nosql/Makefile.am
+++ b/sca-cpp/trunk/samples/store-nosql/Makefile.am
diff --git a/sca-cpp/trunk/test/store-nosql/currency-converter.scm b/sca-cpp/trunk/samples/store-nosql/currency-converter.scm
index fc506c3d73..fc506c3d73 100644
--- a/sca-cpp/trunk/test/store-nosql/currency-converter.scm
+++ b/sca-cpp/trunk/samples/store-nosql/currency-converter.scm
diff --git a/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm b/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
index d79ff1b677..d79ff1b677 100644
--- a/sca-cpp/trunk/test/store-nosql/fruits-catalog.scm
+++ b/sca-cpp/trunk/samples/store-nosql/fruits-catalog.scm
diff --git a/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess b/sca-cpp/trunk/samples/store-nosql/htdocs/.htaccess
index e2e343b6b2..e2e343b6b2 100644
--- a/sca-cpp/trunk/test/store-nosql/htdocs/.htaccess
+++ b/sca-cpp/trunk/samples/store-nosql/htdocs/.htaccess
diff --git a/sca-cpp/trunk/test/store-nosql/htdocs/store.html b/sca-cpp/trunk/samples/store-nosql/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-nosql/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-nosql/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-nosql/htdocs/store.js b/sca-cpp/trunk/samples/store-nosql/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-nosql/htdocs/store.js
+++ b/sca-cpp/trunk/samples/store-nosql/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-nosql/server-test b/sca-cpp/trunk/samples/store-nosql/server-test
index d2013f6892..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-nosql/server-test
+++ b/sca-cpp/trunk/samples/store-nosql/server-test
diff --git a/sca-cpp/trunk/test/store-nosql/shopping-cart.scm b/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm
index 484044d420..484044d420 100644
--- a/sca-cpp/trunk/test/store-nosql/shopping-cart.scm
+++ b/sca-cpp/trunk/samples/store-nosql/shopping-cart.scm
diff --git a/sca-cpp/trunk/test/store-nosql/ssl-start b/sca-cpp/trunk/samples/store-nosql/ssl-start
index b18a8e4af1..b18a8e4af1 100755
--- a/sca-cpp/trunk/test/store-nosql/ssl-start
+++ b/sca-cpp/trunk/samples/store-nosql/ssl-start
diff --git a/sca-cpp/trunk/test/store-nosql/start b/sca-cpp/trunk/samples/store-nosql/start
index 79da4682b2..79da4682b2 100755
--- a/sca-cpp/trunk/test/store-nosql/start
+++ b/sca-cpp/trunk/samples/store-nosql/start
diff --git a/sca-cpp/trunk/test/store-nosql/stop b/sca-cpp/trunk/samples/store-nosql/stop
index 3b4f46694d..3b4f46694d 100755
--- a/sca-cpp/trunk/test/store-nosql/stop
+++ b/sca-cpp/trunk/samples/store-nosql/stop
diff --git a/sca-cpp/trunk/test/store-nosql/store.composite b/sca-cpp/trunk/samples/store-nosql/store.composite
index 1912f3a3a1..1912f3a3a1 100644
--- a/sca-cpp/trunk/test/store-nosql/store.composite
+++ b/sca-cpp/trunk/samples/store-nosql/store.composite
diff --git a/sca-cpp/trunk/test/store-nosql/store.scm b/sca-cpp/trunk/samples/store-nosql/store.scm
index d851dc7ed6..d851dc7ed6 100644
--- a/sca-cpp/trunk/test/store-nosql/store.scm
+++ b/sca-cpp/trunk/samples/store-nosql/store.scm
diff --git a/sca-cpp/trunk/test/store-python/Makefile.am b/sca-cpp/trunk/samples/store-python/Makefile.am
index 2bdd776e10..2bdd776e10 100644
--- a/sca-cpp/trunk/test/store-python/Makefile.am
+++ b/sca-cpp/trunk/samples/store-python/Makefile.am
diff --git a/sca-cpp/trunk/test/store-python/currency-converter.py b/sca-cpp/trunk/samples/store-python/currency-converter.py
index 2fded8f616..2fded8f616 100644
--- a/sca-cpp/trunk/test/store-python/currency-converter.py
+++ b/sca-cpp/trunk/samples/store-python/currency-converter.py
diff --git a/sca-cpp/trunk/test/store-python/fruits-catalog.py b/sca-cpp/trunk/samples/store-python/fruits-catalog.py
index 75c18f5f99..75c18f5f99 100644
--- a/sca-cpp/trunk/test/store-python/fruits-catalog.py
+++ b/sca-cpp/trunk/samples/store-python/fruits-catalog.py
diff --git a/sca-cpp/trunk/test/store-python/htdocs/.htaccess b/sca-cpp/trunk/samples/store-python/htdocs/.htaccess
index e2e343b6b2..e2e343b6b2 100644
--- a/sca-cpp/trunk/test/store-python/htdocs/.htaccess
+++ b/sca-cpp/trunk/samples/store-python/htdocs/.htaccess
diff --git a/sca-cpp/trunk/test/store-python/htdocs/store.html b/sca-cpp/trunk/samples/store-python/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-python/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-python/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-python/htdocs/store.js b/sca-cpp/trunk/samples/store-python/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-python/htdocs/store.js
+++ b/sca-cpp/trunk/samples/store-python/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-python/server-test b/sca-cpp/trunk/samples/store-python/server-test
index d2013f6892..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-python/server-test
+++ b/sca-cpp/trunk/samples/store-python/server-test
diff --git a/sca-cpp/trunk/test/store-python/shopping-cart.py b/sca-cpp/trunk/samples/store-python/shopping-cart.py
index 2cb6da140a..2cb6da140a 100644
--- a/sca-cpp/trunk/test/store-python/shopping-cart.py
+++ b/sca-cpp/trunk/samples/store-python/shopping-cart.py
diff --git a/sca-cpp/trunk/test/store-python/ssl-start b/sca-cpp/trunk/samples/store-python/ssl-start
index 1e70d6edfb..1e70d6edfb 100755
--- a/sca-cpp/trunk/test/store-python/ssl-start
+++ b/sca-cpp/trunk/samples/store-python/ssl-start
diff --git a/sca-cpp/trunk/test/store-python/start b/sca-cpp/trunk/samples/store-python/start
index 8df7875634..8df7875634 100755
--- a/sca-cpp/trunk/test/store-python/start
+++ b/sca-cpp/trunk/samples/store-python/start
diff --git a/sca-cpp/trunk/test/store-python/stop b/sca-cpp/trunk/samples/store-python/stop
index a59273b8ed..a59273b8ed 100755
--- a/sca-cpp/trunk/test/store-python/stop
+++ b/sca-cpp/trunk/samples/store-python/stop
diff --git a/sca-cpp/trunk/test/store-python/store.composite b/sca-cpp/trunk/samples/store-python/store.composite
index 889f514624..889f514624 100644
--- a/sca-cpp/trunk/test/store-python/store.composite
+++ b/sca-cpp/trunk/samples/store-python/store.composite
diff --git a/sca-cpp/trunk/test/store-python/store.py b/sca-cpp/trunk/samples/store-python/store.py
index 35c0f5b2aa..35c0f5b2aa 100644
--- a/sca-cpp/trunk/test/store-python/store.py
+++ b/sca-cpp/trunk/samples/store-python/store.py
diff --git a/sca-cpp/trunk/test/store-scheme/Makefile.am b/sca-cpp/trunk/samples/store-scheme/Makefile.am
index 77cceb8352..77cceb8352 100644
--- a/sca-cpp/trunk/test/store-scheme/Makefile.am
+++ b/sca-cpp/trunk/samples/store-scheme/Makefile.am
diff --git a/sca-cpp/trunk/test/store-scheme/currency-converter.scm b/sca-cpp/trunk/samples/store-scheme/currency-converter.scm
index fc506c3d73..fc506c3d73 100644
--- a/sca-cpp/trunk/test/store-scheme/currency-converter.scm
+++ b/sca-cpp/trunk/samples/store-scheme/currency-converter.scm
diff --git a/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm b/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm
index d79ff1b677..d79ff1b677 100644
--- a/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm
+++ b/sca-cpp/trunk/samples/store-scheme/fruits-catalog.scm
diff --git a/sca-cpp/trunk/test/store-scheme/htdocs/.htaccess b/sca-cpp/trunk/samples/store-scheme/htdocs/.htaccess
index e2e343b6b2..e2e343b6b2 100644
--- a/sca-cpp/trunk/test/store-scheme/htdocs/.htaccess
+++ b/sca-cpp/trunk/samples/store-scheme/htdocs/.htaccess
diff --git a/sca-cpp/trunk/test/store-scheme/htdocs/store.html b/sca-cpp/trunk/samples/store-scheme/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-scheme/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-scheme/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-scheme/htdocs/store.js b/sca-cpp/trunk/samples/store-scheme/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-scheme/htdocs/store.js
+++ b/sca-cpp/trunk/samples/store-scheme/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-scheme/script-test.cpp b/sca-cpp/trunk/samples/store-scheme/script-test.cpp
index c8eecb65c3..c8eecb65c3 100644
--- a/sca-cpp/trunk/test/store-scheme/script-test.cpp
+++ b/sca-cpp/trunk/samples/store-scheme/script-test.cpp
diff --git a/sca-cpp/trunk/test/store-scheme/script-test.scm b/sca-cpp/trunk/samples/store-scheme/script-test.scm
index 6db3408794..6db3408794 100644
--- a/sca-cpp/trunk/test/store-scheme/script-test.scm
+++ b/sca-cpp/trunk/samples/store-scheme/script-test.scm
diff --git a/sca-cpp/trunk/test/store-scheme/server-test b/sca-cpp/trunk/samples/store-scheme/server-test
index d2013f6892..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-scheme/server-test
+++ b/sca-cpp/trunk/samples/store-scheme/server-test
diff --git a/sca-cpp/trunk/test/store-scheme/shopping-cart.scm b/sca-cpp/trunk/samples/store-scheme/shopping-cart.scm
index 484044d420..484044d420 100644
--- a/sca-cpp/trunk/test/store-scheme/shopping-cart.scm
+++ b/sca-cpp/trunk/samples/store-scheme/shopping-cart.scm
diff --git a/sca-cpp/trunk/test/store-scheme/ssl-start b/sca-cpp/trunk/samples/store-scheme/ssl-start
index 14b85f5342..14b85f5342 100755
--- a/sca-cpp/trunk/test/store-scheme/ssl-start
+++ b/sca-cpp/trunk/samples/store-scheme/ssl-start
diff --git a/sca-cpp/trunk/test/store-scheme/start b/sca-cpp/trunk/samples/store-scheme/start
index ffd7173ee2..ffd7173ee2 100755
--- a/sca-cpp/trunk/test/store-scheme/start
+++ b/sca-cpp/trunk/samples/store-scheme/start
diff --git a/sca-cpp/trunk/test/store-scheme/stop b/sca-cpp/trunk/samples/store-scheme/stop
index a59273b8ed..a59273b8ed 100755
--- a/sca-cpp/trunk/test/store-scheme/stop
+++ b/sca-cpp/trunk/samples/store-scheme/stop
diff --git a/sca-cpp/trunk/test/store-scheme/store.composite b/sca-cpp/trunk/samples/store-scheme/store.composite
index 36b155b595..36b155b595 100644
--- a/sca-cpp/trunk/test/store-scheme/store.composite
+++ b/sca-cpp/trunk/samples/store-scheme/store.composite
diff --git a/sca-cpp/trunk/test/store-scheme/store.scm b/sca-cpp/trunk/samples/store-scheme/store.scm
index d851dc7ed6..d851dc7ed6 100644
--- a/sca-cpp/trunk/test/store-scheme/store.scm
+++ b/sca-cpp/trunk/samples/store-scheme/store.scm
diff --git a/sca-cpp/trunk/test/store-sql/Makefile.am b/sca-cpp/trunk/samples/store-sql/Makefile.am
index 345e58d544..345e58d544 100644
--- a/sca-cpp/trunk/test/store-sql/Makefile.am
+++ b/sca-cpp/trunk/samples/store-sql/Makefile.am
diff --git a/sca-cpp/trunk/test/store-sql/currency-converter.scm b/sca-cpp/trunk/samples/store-sql/currency-converter.scm
index fc506c3d73..fc506c3d73 100644
--- a/sca-cpp/trunk/test/store-sql/currency-converter.scm
+++ b/sca-cpp/trunk/samples/store-sql/currency-converter.scm
diff --git a/sca-cpp/trunk/test/store-sql/fruits-catalog.scm b/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm
index d79ff1b677..d79ff1b677 100644
--- a/sca-cpp/trunk/test/store-sql/fruits-catalog.scm
+++ b/sca-cpp/trunk/samples/store-sql/fruits-catalog.scm
diff --git a/sca-cpp/trunk/test/store-sql/htdocs/.htaccess b/sca-cpp/trunk/samples/store-sql/htdocs/.htaccess
index e2e343b6b2..e2e343b6b2 100644
--- a/sca-cpp/trunk/test/store-sql/htdocs/.htaccess
+++ b/sca-cpp/trunk/samples/store-sql/htdocs/.htaccess
diff --git a/sca-cpp/trunk/test/store-sql/htdocs/store.html b/sca-cpp/trunk/samples/store-sql/htdocs/store.html
index 21eabca7a7..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-sql/htdocs/store.html
+++ b/sca-cpp/trunk/samples/store-sql/htdocs/store.html
diff --git a/sca-cpp/trunk/test/store-sql/htdocs/store.js b/sca-cpp/trunk/samples/store-sql/htdocs/store.js
index 9cd8eb526d..9cd8eb526d 100644
--- a/sca-cpp/trunk/test/store-sql/htdocs/store.js
+++ b/sca-cpp/trunk/samples/store-sql/htdocs/store.js
diff --git a/sca-cpp/trunk/test/store-sql/server-test b/sca-cpp/trunk/samples/store-sql/server-test
index d2013f6892..d2013f6892 100755
--- a/sca-cpp/trunk/test/store-sql/server-test
+++ b/sca-cpp/trunk/samples/store-sql/server-test
diff --git a/sca-cpp/trunk/test/store-sql/shopping-cart.scm b/sca-cpp/trunk/samples/store-sql/shopping-cart.scm
index 484044d420..484044d420 100644
--- a/sca-cpp/trunk/test/store-sql/shopping-cart.scm
+++ b/sca-cpp/trunk/samples/store-sql/shopping-cart.scm
diff --git a/sca-cpp/trunk/test/store-sql/ssl-start b/sca-cpp/trunk/samples/store-sql/ssl-start
index 8e27d31a2e..8e27d31a2e 100755
--- a/sca-cpp/trunk/test/store-sql/ssl-start
+++ b/sca-cpp/trunk/samples/store-sql/ssl-start
diff --git a/sca-cpp/trunk/test/store-sql/start b/sca-cpp/trunk/samples/store-sql/start
index 60f5a2d702..60f5a2d702 100755
--- a/sca-cpp/trunk/test/store-sql/start
+++ b/sca-cpp/trunk/samples/store-sql/start
diff --git a/sca-cpp/trunk/test/store-sql/stop b/sca-cpp/trunk/samples/store-sql/stop
index 603165ef46..603165ef46 100755
--- a/sca-cpp/trunk/test/store-sql/stop
+++ b/sca-cpp/trunk/samples/store-sql/stop
diff --git a/sca-cpp/trunk/test/store-sql/store.composite b/sca-cpp/trunk/samples/store-sql/store.composite
index 58c2741a5e..58c2741a5e 100644
--- a/sca-cpp/trunk/test/store-sql/store.composite
+++ b/sca-cpp/trunk/samples/store-sql/store.composite
diff --git a/sca-cpp/trunk/test/store-sql/store.scm b/sca-cpp/trunk/samples/store-sql/store.scm
index d851dc7ed6..d851dc7ed6 100644
--- a/sca-cpp/trunk/test/store-sql/store.scm
+++ b/sca-cpp/trunk/samples/store-sql/store.scm
diff --git a/sca-cpp/trunk/test/Makefile.am b/sca-cpp/trunk/test/Makefile.am
deleted file mode 100644
index a3e0cfa6b8..0000000000
--- a/sca-cpp/trunk/test/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#  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.
-
-SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql store-nosql
-