Author: jsdelfino
Date: Mon Jan 30 15:54:12 2012
New Revision: 1237737
URL: http://svn.apache.org/viewvc?rev=1237737&view=rev
Log:
Change samples to use standard example.com domain name.
Modified:
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-cluster/server-test
tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html
tuscany/sca-cpp/trunk/samples/store-vhost/server-test
tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
tuscany/sca-cpp/trunk/samples/store-vhost/start
tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/index.html Mon Jan 30
15:54:12 2012
@@ -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>
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-test?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/server-test (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-test Mon Jan 30 15:54:12
2012
@@ -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/htt
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
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/ssl-start Mon Jan 30 15:54:12
2012
@@ -34,10 +34,10 @@ sudo ../../ubuntu/ip-redirect-all 119 81
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
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/index.html Mon Jan 30
15:54:12 2012
@@ -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>
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/server-test
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/server-test?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/server-test (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/server-test Mon Jan 30 15:54:12
2012
@@ -26,27 +26,27 @@ curl_prefix=`cat $here/../../modules/htt
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
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Mon Jan 30 15:54:12 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/start?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/start Mon Jan 30 15:54:12 2012
@@ -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
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start?rev=1237737&r1=1237736&r2=1237737&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start Mon Jan 30 15:54:12
2012
@@ -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
