Merge r1026251 Remove explicit host name and port number from sample files
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1027716 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/samples/feed-aggregator-webapp/README b/samples/feed-aggregator-webapp/README
index 74c3965..560c6c4 100644
--- a/samples/feed-aggregator-webapp/README
+++ b/samples/feed-aggregator-webapp/README
@@ -20,11 +20,13 @@
http://localhost:8080/sample-feed-aggregator-webapp
+The port and hostname will of course vary depending on your local installation.
+
You will then see the following displayed in your Web browser.
-http://localhost:8083/atomAggregator
-http://localhost:8083/atomAggregator/atomsvc
-http://localhost:8083/rssAggregator
+http://{server-host}:{server-port}/sample-feed-aggregator-webapp/atomAggregator
+http://{server-host}:{server-port}/sample-feed-aggregator-webapp/atomAggregator/atomsvc
+http://{server-host}:{server-port}/sample-feed-aggregator-webapp/rssAggregator
** Please note that if your browser is not configured correctly to receive
feed information, you will be prompted to open each file that contains the feed
diff --git a/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 3ac5a3c..a3d09db 100644
--- a/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
@@ -23,10 +23,10 @@
name="FeedAggregator">
<service name="rssSample" promote="RssAggregator">
- <tuscany:binding.atom uri="http://localhost:8083/rssAggregator"/>
+ <tuscany:binding.atom uri="rssAggregator"/>
</service>
<service name="atomSample" promote="AtomAggregator">
- <tuscany:binding.atom uri="http://localhost:8083/atomAggregator"/>
+ <tuscany:binding.atom uri="atomAggregator"/>
</service>
<component name="RssAggregator">
diff --git a/samples/feed-aggregator-webapp/src/main/webapp/index.html b/samples/feed-aggregator-webapp/src/main/webapp/index.html
index 7b33391..7220683 100644
--- a/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/samples/feed-aggregator-webapp/src/main/webapp/index.html
@@ -23,10 +23,11 @@
<body>
<h2>Apache Tuscany Feed Aggregator Sample</h2>
- <p>To read the aggregated feeds, point your Web browser to the following addresses:</p>
- <br/><a href="atomAggregator">http://localhost:8083/sample-feed-aggregator-webapp/atomAggregator</a>
- <br/><a href="atomAggregator/atomsvc">http://localhost:8083/sample-feed-aggregator-webapp/atomAggregator/atomsvc (for the Atom service document)</a>
- <br/><a href="rssAggregator">http://localhost:8083/sample-feed-aggregator-webapp/rssAggregator</a>
+ <p>To read the aggregated feeds, point your Web browser to the following addresses or click on these links:</p>
+ <a href="atomAggregator">http://{server-host}:{server-port}/sample-feed-aggregator-webapp/atomAggregator</a><br/>
+ <a href="atomAggregator/atomsvc">http://{server-host}:{server-port}/sample-feed-aggregator-webapp/atomAggregator/atomsvc (for the Atom service document)</a><br/>
+ <a href="rssAggregator">http://{server-host}:{server-port}/sample-feed-aggregator-webapp/rssAggregator</a>
+ <p>where {server-host} and {server-port} are the host and port of your web application server.</p>
</body>
</html>
