summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java10
-rw-r--r--sca-java-2.x/trunk/samples/applications/store/src/main/resources/uiservices/store.html2
2 files changed, 10 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index 155d07ae86..bc8149a67a 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
@@ -95,7 +95,15 @@ class AtomServiceBindingProvider implements ServiceBindingProvider {
bindingURI += "/";
}
- servletHost.addServletMapping(bindingURI, servlet);
+ String mappedURI = servletHost.addServletMapping(bindingURI, servlet);
+ String deployedURI = mappedURI;
+ if (deployedURI.endsWith("*")) {
+ deployedURI = deployedURI.substring(0, deployedURI.length() - 1);
+ }
+ if (deployedURI.endsWith("/")) {
+ deployedURI = deployedURI.substring(0, deployedURI.length() - 1);
+ }
+ binding.setURI(deployedURI);
}
public void stop() {
diff --git a/sca-java-2.x/trunk/samples/applications/store/src/main/resources/uiservices/store.html b/sca-java-2.x/trunk/samples/applications/store/src/main/resources/uiservices/store.html
index 000f1f891f..be3efea327 100644
--- a/sca-java-2.x/trunk/samples/applications/store/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/trunk/samples/applications/store/src/main/resources/uiservices/store.html
@@ -20,7 +20,7 @@
<head>
<title>Store</title>
-<script type="text/javascript" src="/dojo/dojo.js"></script>
+<script type="text/javascript" src="../dojo/dojo.js"></script>
<script type="text/javascript" src="store.js"></script>
<script language="JavaScript">