summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2008-06-24 14:40:03 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2008-06-24 14:40:03 +0000
commitf4ab8f1de519c7968f9ca87fa2dfef7494020b2f (patch)
tree5903b77a8b6141522ae8bc0095e5843a5d344247 /branches
parentd4cb1f400fa91e1804e29c0f8285d9bccaf30bc7 (diff)
TUSCANY-2430 correct the way that the servlet interface is used to calculate the required feed. This now works on Windows but needs testing on Linux.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@671196 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
-rw-r--r--branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java9
-rw-r--r--branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite2
-rw-r--r--branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite2
3 files changed, 10 insertions, 3 deletions
diff --git a/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index 31976ec260..8772a12eff 100644
--- a/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
@@ -148,8 +148,15 @@ class AtomBindingListenerServlet extends HttpServlet {
// No authentication required for a get request
+ System.out.println(request.getRequestURI());
+ System.out.println(request.getServletPath());
+ System.out.println(request.getContextPath());
+ System.out.println(request.getPathInfo());
+ System.out.println(request.getRequestURL());
+
// Get the request path
- String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
+ String servletPath = request.getContextPath() + request.getServletPath();
+ String path = URLDecoder.decode(request.getRequestURI().substring(servletPath.length()), "UTF-8");
logger.fine("get " + request.getRequestURI());
diff --git a/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
index e3f20e9eed..d41fe3e4a0 100644
--- a/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ b/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
@@ -31,7 +31,7 @@
<component name="RssAggregator">
<implementation.java class="feed.AggregatorImpl"/>
- <reference name="rssfeed1">
+ <reference name="rssFeed1">
<tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>
</reference>
<reference name="rssFeed2">
diff --git a/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
index 836499e58f..34f313672e 100644
--- a/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ b/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
@@ -31,7 +31,7 @@
<component name="RssAggregator">
<implementation.java class="feed.AggregatorImpl"/>
- <reference name="rssfeed1">
+ <reference name="rssFeed1">
<tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>
</reference>
<reference name="rssFeed2">