Author: slaws
Date: Tue Jun 24 07:40:03 2008
New Revision: 671196
URL: http://svn.apache.org/viewvc?rev=671196&view=rev
Log:
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.
Modified:
tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
tuscany/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
tuscany/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
Modified:
tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java?rev=671196&r1=671195&r2=671196&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
(original)
+++
tuscany/branches/sca-java-1.3/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
Tue Jun 24 07:40:03 2008
@@ -148,8 +148,15 @@
// 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());
Modified:
tuscany/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite?rev=671196&r1=671195&r2=671196&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
(original)
+++
tuscany/branches/sca-java-1.3/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
Tue Jun 24 07:40:03 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/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite?rev=671196&r1=671195&r2=671196&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
(original)
+++
tuscany/branches/sca-java-1.3/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
Tue Jun 24 07:40:03 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">
