Author: antelder
Date: Wed Apr 2 01:41:01 2008
New Revision: 643792
URL: http://svn.apache.org/viewvc?rev=643792&view=rev
Log:
Merge fix for TUSCANY-1974 from trunk to 1.2 branch
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
incubator/tuscany/branches/sca-java-1.2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java?rev=643792&r1=643791&r2=643792&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
Wed Apr 2 01:41:01 2008
@@ -146,7 +146,7 @@
// Use the DWR remoter to generate the JavaScipt function for each SCA
service
Remoter remoter =
(Remoter)getContainer().getBean(Remoter.class.getName());
- String path = request.getServletPath();
+ String path = request.getContextPath() + request.getServletPath();
for (String serviceName : services.keySet()) {
String serviceScript =
remoter.generateInterfaceScript(serviceName, path);
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=643792&r1=643791&r2=643792&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Wed Apr 2 01:41:01 2008
@@ -185,10 +185,11 @@
if (servletPath.endsWith("*")) {
servletPath = servletPath.substring(0, servletPath.length() -
1);
if (suri.startsWith(servletPath)) {
- return new WebAppRequestDispatcher(entry.getKey(),
entry.getValue());
+ // entry key is contextPath/servletPath,
WebAppRequestDispatcher only wants servletPath
+ return new
WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()),
entry.getValue());
} else {
if ((suri + "/").startsWith(servletPath)) {
- return new WebAppRequestDispatcher(entry.getKey(),
entry.getValue());
+ return new
WebAppRequestDispatcher(entry.getKey().substring(contextPath.length()),
entry.getValue());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
