Author: slaws
Date: Sun Jun 29 11:43:35 2008
New Revision: 672659
URL: http://svn.apache.org/viewvc?rev=672659&view=rev
Log:
TUSCANY-2430, fix the algorithm used to work out the feed URL.
Modified:
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
tuscany/java/sca/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
tuscany/java/sca/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
Modified:
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java?rev=672659&r1=672658&r2=672659&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
(original)
+++
tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
Sun Jun 29 11:43:35 2008
@@ -147,9 +147,10 @@
protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
// No authentication required for a get request
-
+
// Get the request path
- String path =
URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()),
"UTF-8");
+ int servletPathLength = request.getContextPath().length() +
request.getServletPath().length();
+ String path =
URLDecoder.decode(request.getRequestURI().substring(servletPathLength),
"UTF-8");
logger.fine("get " + request.getRequestURI());
Modified:
tuscany/java/sca/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite?rev=672659&r1=672658&r2=672659&view=diff
==============================================================================
---
tuscany/java/sca/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
(original)
+++
tuscany/java/sca/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
Sun Jun 29 11:43:35 2008
@@ -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">
Modified:
tuscany/java/sca/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/samples/feed-aggregator/src/main/resources/FeedAggregator.composite?rev=672659&r1=672658&r2=672659&view=diff
==============================================================================
---
tuscany/java/sca/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
(original)
+++
tuscany/java/sca/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
Sun Jun 29 11:43:35 2008
@@ -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">
