diff options
-rw-r--r-- | sca-cpp/trunk/samples/store-cluster/htdocs/index.html | 6 | ||||
-rwxr-xr-x | sca-cpp/trunk/samples/store-cluster/server-test | 10 | ||||
-rwxr-xr-x | sca-cpp/trunk/samples/store-cluster/ssl-start | 6 | ||||
-rw-r--r-- | sca-cpp/trunk/samples/store-vhost/htdocs/index.html | 6 | ||||
-rwxr-xr-x | sca-cpp/trunk/samples/store-vhost/server-test | 10 | ||||
-rwxr-xr-x | sca-cpp/trunk/samples/store-vhost/ssl-start | 12 | ||||
-rwxr-xr-x | sca-cpp/trunk/samples/store-vhost/start | 4 | ||||
-rwxr-xr-x | sca-cpp/trunk/samples/store-vhost/uec2-start | 2 |
8 files changed, 28 insertions, 28 deletions
diff --git a/sca-cpp/trunk/samples/store-cluster/htdocs/index.html b/sca-cpp/trunk/samples/store-cluster/htdocs/index.html index 018bac3a32..a2b44bcb96 100644 --- a/sca-cpp/trunk/samples/store-cluster/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-cluster/htdocs/index.html @@ -29,11 +29,11 @@ <h1>Store</h1>
<br/>
<p>For this sample to work, add the sample domain to your /etc/hosts as follows:<br/>
-127.0.0.1 sca-store.com jane.sca-store.com joe.sca-store.com</p>
+127.0.0.1 example.com jane.example.com joe.example.com</p>
<p/>
-<p>Jane's store at <a href="http://jane.sca-store.com/">jane.sca-store.com</a>
-<br/>Joe's store at <a href="http://joe.sca-store.com/">joe.sca-store.com</a></p>
+<p>Jane's store at <a href="http://jane.example.com/">jane.example.com</a>
+<br/>Joe's store at <a href="http://joe.example.com/">joe.example.com</a></p>
</body>
</html>
diff --git a/sca-cpp/trunk/samples/store-cluster/server-test b/sca-cpp/trunk/samples/store-cluster/server-test index 0a3a5ea73b..836097dcae 100755 --- a/sca-cpp/trunk/samples/store-cluster/server-test +++ b/sca-cpp/trunk/samples/store-cluster/server-test @@ -18,7 +18,7 @@ # under the License. # For this test to work, add the test domain to your etc/hosts as follows: -# 127.0.0.1 sca-store.com joe.sca-store.com joe.sca-store.com +# 127.0.0.1 example.com joe.example.com joe.example.com echo "Testing..." here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` @@ -29,24 +29,24 @@ curl_prefix=`cat $here/../../modules/http/curl.prefix` sleep 2 # Test HTTP GET -$curl_prefix/bin/curl http://joe.sca-store.com/ 2>/dev/null >tmp/index.html +$curl_prefix/bin/curl http://joe.example.com/ 2>/dev/null >tmp/index.html diff tmp/index.html htdocs/domains/joe/index.html rc=$? # Test Catalog if [ "$rc" = "0" ]; then - $curl_prefix/bin/curl http://joe.sca-store.com/references/Store/catalog -X POST -H "Content-type: application/json-rpc" --data @../store-cpp/htdocs/test/items-request.txt >tmp/items-result.txt 2>/dev/null + $curl_prefix/bin/curl http://joe.example.com/references/Store/catalog -X POST -H "Content-type: application/json-rpc" --data @../store-cpp/htdocs/test/items-request.txt >tmp/items-result.txt 2>/dev/null diff tmp/items-result.txt ../store-cpp/htdocs/test/items-result.txt rc=$? fi # Test Shopping Cart if [ "$rc" = "0" ]; then - $curl_prefix/bin/curl http://joe.sca-store.com/references/Store/shoppingCart -X POST -H "Content-type: application/atom+xml" --data @../store-cpp/htdocs/test/shopping-cart-entry.xml 2>/dev/null + $curl_prefix/bin/curl http://joe.example.com/references/Store/shoppingCart -X POST -H "Content-type: application/atom+xml" --data @../store-cpp/htdocs/test/shopping-cart-entry.xml 2>/dev/null rc=$? fi if [ "$rc" = "0" ]; then - $curl_prefix/bin/curl http://joe.sca-store.com/references/Store/shoppingCart >tmp/shopping-cart-feed.xml 2>/dev/null + $curl_prefix/bin/curl http://joe.example.com/references/Store/shoppingCart >tmp/shopping-cart-feed.xml 2>/dev/null grep "3.55" tmp/shopping-cart-feed.xml >/dev/null rc=$? fi diff --git a/sca-cpp/trunk/samples/store-cluster/ssl-start b/sca-cpp/trunk/samples/store-cluster/ssl-start index 621a3e7b10..04aa267d5e 100755 --- a/sca-cpp/trunk/samples/store-cluster/ssl-start +++ b/sca-cpp/trunk/samples/store-cluster/ssl-start @@ -34,10 +34,10 @@ sudo ../../ubuntu/ip-redirect-all 119 8119 sudo ../../ubuntu/ip-redirect-all 563 8563 # Generate SSL certificates -../../modules/http/ssl-ca-conf tmp/ssl sca-store.com +../../modules/http/ssl-ca-conf tmp/ssl example.com ../../modules/http/ssl-cert-conf tmp/ssl localhost server -../../modules/http/ssl-cert-conf tmp/ssl *.sca-store.com vhost -../../modules/http/ssl-cert-conf tmp/ssl sca-store.com proxy +../../modules/http/ssl-cert-conf tmp/ssl *.example.com vhost +../../modules/http/ssl-cert-conf tmp/ssl example.com proxy ../../modules/http/ssl-cert-conf tmp/ssl localhost tunnel # Start an SSL tunnel diff --git a/sca-cpp/trunk/samples/store-vhost/htdocs/index.html b/sca-cpp/trunk/samples/store-vhost/htdocs/index.html index 3e70b69214..72a797e1d9 100644 --- a/sca-cpp/trunk/samples/store-vhost/htdocs/index.html +++ b/sca-cpp/trunk/samples/store-vhost/htdocs/index.html @@ -29,11 +29,11 @@ <h1>Store</h1>
<br/>
<p>For this sample to work, add the sample domain to your /etc/hosts as follows:<br/>
-127.0.0.1 sca-store.com jane.sca-store.com joe.sca-store.com</p>
+127.0.0.1 example.com jane.example.com joe.example.com</p>
<p/>
-<p>Jane's store at <a href="http://jane.sca-store.com:8090/">jane.sca-store.com</a>
-<br/>Joe's store at <a href="http://joe.sca-store.com:8090/">joe.sca-store.com</a></p>
+<p>Jane's store at <a href="http://jane.example.com:8090/">jane.example.com</a>
+<br/>Joe's store at <a href="http://joe.example.com:8090/">joe.example.com</a></p>
</body>
</html>
diff --git a/sca-cpp/trunk/samples/store-vhost/server-test b/sca-cpp/trunk/samples/store-vhost/server-test index dd3893948e..4d8c7a9129 100755 --- a/sca-cpp/trunk/samples/store-vhost/server-test +++ b/sca-cpp/trunk/samples/store-vhost/server-test @@ -26,27 +26,27 @@ curl_prefix=`cat $here/../../modules/http/curl.prefix` sleep 2 # For this test to work, add the test domain to your etc/hosts as follows: -# 127.0.0.1 sca-store.com joe.sca-store.com joe.sca-store.com +# 127.0.0.1 example.com joe.example.com joe.example.com # Test HTTP GET -$curl_prefix/bin/curl http://joe.sca-store.com:8090/ 2>/dev/null >tmp/index.html +$curl_prefix/bin/curl http://joe.example.com:8090/ 2>/dev/null >tmp/index.html diff tmp/index.html htdocs/domains/joe/index.html rc=$? # Test Catalog if [ "$rc" = "0" ]; then - $curl_prefix/bin/curl http://joe.sca-store.com:8090/references/Store/catalog -X POST -H "Content-type: application/json-rpc" --data @../store-cpp/htdocs/test/items-request.txt >tmp/items-result.txt 2>/dev/null + $curl_prefix/bin/curl http://joe.example.com:8090/references/Store/catalog -X POST -H "Content-type: application/json-rpc" --data @../store-cpp/htdocs/test/items-request.txt >tmp/items-result.txt 2>/dev/null diff tmp/items-result.txt ../store-cpp/htdocs/test/items-result.txt rc=$? fi # Test Shopping Cart if [ "$rc" = "0" ]; then - $curl_prefix/bin/curl http://joe.sca-store.com:8090/references/Store/shoppingCart -X POST -H "Content-type: application/atom+xml" --data @../store-cpp/htdocs/test/shopping-cart-entry.xml 2>/dev/null + $curl_prefix/bin/curl http://joe.example.com:8090/references/Store/shoppingCart -X POST -H "Content-type: application/atom+xml" --data @../store-cpp/htdocs/test/shopping-cart-entry.xml 2>/dev/null rc=$? fi if [ "$rc" = "0" ]; then - $curl_prefix/bin/curl http://joe.sca-store.com:8090/references/Store/shoppingCart >tmp/shopping-cart-feed.xml 2>/dev/null + $curl_prefix/bin/curl http://joe.example.com:8090/references/Store/shoppingCart >tmp/shopping-cart-feed.xml 2>/dev/null grep "3.55" tmp/shopping-cart-feed.xml >/dev/null rc=$? fi diff --git a/sca-cpp/trunk/samples/store-vhost/ssl-start b/sca-cpp/trunk/samples/store-vhost/ssl-start index 17f4e7f5af..ef6e40f93a 100755 --- a/sca-cpp/trunk/samples/store-vhost/ssl-start +++ b/sca-cpp/trunk/samples/store-vhost/ssl-start @@ -18,12 +18,12 @@ # under the License. # For this sample to work, add the sample domain to your /etc/hosts as follows: -# 127.0.0.1 sca-store.com jane.sca-store.com joe.sca-store.com +# 127.0.0.1 example.com jane.example.com joe.example.com -../../modules/http/ssl-ca-conf tmp sca-store.com -../../modules/http/ssl-cert-conf tmp sca-store.com server -../../modules/http/ssl-cert-conf tmp *.sca-store.com vhost -../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs +../../modules/http/ssl-ca-conf tmp example.com +../../modules/http/ssl-cert-conf tmp example.com server +../../modules/http/ssl-cert-conf tmp *.example.com vhost +../../modules/http/httpd-conf tmp example.com 8090 htdocs ../../modules/http/httpd-event-conf tmp ../../modules/http/vhost-conf tmp domains htdocs ../../modules/http/httpd-ssl-conf tmp 8453 @@ -38,7 +38,7 @@ SCAContribution `pwd`/shared/ SCAComposite shared.composite # Configure SCA Composite for mass dynamic virtual Hosting -SCAVirtualDomain sca-store.com +SCAVirtualDomain example.com SCAVirtualContribution `pwd`/domains/ SCAVirtualComposite store.composite diff --git a/sca-cpp/trunk/samples/store-vhost/start b/sca-cpp/trunk/samples/store-vhost/start index 0b5740a46e..9c76b6f748 100755 --- a/sca-cpp/trunk/samples/store-vhost/start +++ b/sca-cpp/trunk/samples/store-vhost/start @@ -17,7 +17,7 @@ # specific language governing permissions and limitations # under the License. -../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs +../../modules/http/httpd-conf tmp example.com 8090 htdocs ../../modules/http/httpd-event-conf tmp ../../modules/http/vhost-conf tmp domains htdocs ../../modules/server/server-conf tmp @@ -28,7 +28,7 @@ SCAContribution `pwd`/shared/ SCAComposite shared.composite # Configure SCA Composite for mass dynamic virtual hosting -SCAVirtualDomain sca-store.com +SCAVirtualDomain example.com SCAVirtualContribution `pwd`/domains/ SCAVirtualComposite store.composite diff --git a/sca-cpp/trunk/samples/store-vhost/uec2-start b/sca-cpp/trunk/samples/store-vhost/uec2-start index 385021a0da..d530d1d2a7 100755 --- a/sca-cpp/trunk/samples/store-vhost/uec2-start +++ b/sca-cpp/trunk/samples/store-vhost/uec2-start @@ -22,7 +22,7 @@ if [ "$1" != "" ]; then host=$1 else # Default to dummy test domain - host="sca-store.com" + host="example.com" fi # Ports 80, 443, 444, 8090, 8453, 8454 need to be open |