Move samples to samples directory.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@943805 13f79535-47bb-0310-9956-ffa450edef68

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
 	

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

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
                  ])

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
+

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
 

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