From 0389017140b0af23e061fdd66d7467da75f95e83 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Tue, 6 Jul 2010 09:05:57 +0000 Subject: Minor cleanup of config scripts and samples. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@960846 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/samples/store-nosql/Makefile.am | 2 +- sca-cpp/trunk/samples/store-nosql/htdocs/.htaccess | 19 --- .../trunk/samples/store-nosql/htdocs/index.html | 157 +++++++++++++++++++ .../trunk/samples/store-nosql/htdocs/store.html | 170 --------------------- sca-cpp/trunk/samples/store-nosql/server-test | 4 +- 5 files changed, 160 insertions(+), 192 deletions(-) delete mode 100644 sca-cpp/trunk/samples/store-nosql/htdocs/.htaccess create mode 100644 sca-cpp/trunk/samples/store-nosql/htdocs/index.html delete mode 100644 sca-cpp/trunk/samples/store-nosql/htdocs/store.html (limited to 'sca-cpp/trunk/samples/store-nosql') diff --git a/sca-cpp/trunk/samples/store-nosql/Makefile.am b/sca-cpp/trunk/samples/store-nosql/Makefile.am index db87e58d70..e69d8a164f 100644 --- a/sca-cpp/trunk/samples/store-nosql/Makefile.am +++ b/sca-cpp/trunk/samples/store-nosql/Makefile.am @@ -18,7 +18,7 @@ dist_sample_SCRIPTS = start stop ssl-start sampledir = $(prefix)/samples/store-nosql -nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/.htaccess htdocs/*.html +nobase_dist_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*.html dist_noinst_SCRIPTS = server-test TESTS = server-test diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/.htaccess b/sca-cpp/trunk/samples/store-nosql/htdocs/.htaccess deleted file mode 100644 index e2e343b6b2..0000000000 --- a/sca-cpp/trunk/samples/store-nosql/htdocs/.htaccess +++ /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. - -DirectoryIndex store.html diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/index.html b/sca-cpp/trunk/samples/store-nosql/htdocs/index.html new file mode 100644 index 0000000000..c27e54f753 --- /dev/null +++ b/sca-cpp/trunk/samples/store-nosql/htdocs/index.html @@ -0,0 +1,157 @@ + + + +Store + + + + + + + + +

Store

+
+

Catalog

+
+
+
+ +
+
+ +

Your Shopping Cart

+
+
+
+
+
+ + +(feed) +
+
+ + + diff --git a/sca-cpp/trunk/samples/store-nosql/htdocs/store.html b/sca-cpp/trunk/samples/store-nosql/htdocs/store.html deleted file mode 100644 index 4e2ee6795a..0000000000 --- a/sca-cpp/trunk/samples/store-nosql/htdocs/store.html +++ /dev/null @@ -1,170 +0,0 @@ - - - -Store - - - - - - - - -

Store

-
-

Catalog

-
-
-
- -
- -
- -

Your Shopping Cart

-
-
-
-
-
- - - (feed) -
-
- - diff --git a/sca-cpp/trunk/samples/store-nosql/server-test b/sca-cpp/trunk/samples/store-nosql/server-test index d2013f6892..e50467be98 100755 --- a/sca-cpp/trunk/samples/store-nosql/server-test +++ b/sca-cpp/trunk/samples/store-nosql/server-test @@ -26,8 +26,8 @@ curl_prefix=`cat $here/../../modules/http/curl.prefix` sleep 2 # Test HTTP GET -$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html -diff tmp/store.html htdocs/store.html +$curl_prefix/bin/curl http://localhost:8090/ 2>/dev/null >tmp/index.html +diff tmp/index.html htdocs/index.html rc=$? # Cleanup -- cgit v1.2.3