summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 20:00:25 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 20:00:25 +0000
commiteb285f6925f084a4e8458c9eb4ff51b2aa05f2c6 (patch)
treecab2abea02555cf3a17854c358d7d4e3883df050
parentaad67a6127812eb638c2de0b5458843eb6e94684 (diff)
Merge r1026251 Remove explicit host name and port number from sample files
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027716 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/trunk/samples/feed-aggregator-webapp/README8
-rw-r--r--sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite4
-rw-r--r--sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/webapp/index.html9
3 files changed, 12 insertions, 9 deletions
diff --git a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/README b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/README
index 74c39651b0..560c6c4df6 100644
--- a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/README
+++ b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/README
@@ -20,11 +20,13 @@ Once the web app is deployed use your browser to visit the following URL:
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/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index 3ac5a3c2ba..a3d09db0f8 100644
--- a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/sca-java-1.x/trunk/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/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/webapp/index.html
index 7b33391a87..7220683a84 100644
--- a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ b/sca-java-1.x/trunk/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>