summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-03-29 05:29:18 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-03-29 05:29:18 +0000
commit3f309fc3c335346e601458b65949f5efcba467c2 (patch)
tree530fad2bd90b0b1e266d21d786f8ed85d78c378e /sca-java-2.x/trunk
parent849c282ca8ad942a06512b8c5dcd0c87bcd6ff33 (diff)
Reverting changes from revisions 918221, 918222 and 918223
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928593 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java3
-rw-r--r--sca-java-2.x/trunk/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java3
-rw-r--r--sca-java-2.x/trunk/samples/store/README2
-rw-r--r--sca-java-2.x/trunk/samples/store/src/main/resources/store.composite2
4 files changed, 2 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java b/sca-java-2.x/trunk/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
index c758f78b4f..abc3c0c342 100644
--- a/sca-java-2.x/trunk/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
@@ -70,9 +70,6 @@ public class AtomBindingJavascriptProxyFactoryImpl implements JavascriptProxyFac
URI targetURI = URI.create(binding.getURI());
String targetPath = targetURI.getPath();
- if (targetPath.startsWith("/")) {
- targetPath = targetPath.substring(1);
- }
return "tuscany.AtomService(\"" + targetPath + "\")";
}
diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
index 5c20fb3c4f..0388c8bd77 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
@@ -70,9 +70,6 @@ public class JSONRPCBindingJavascriptProxyFactoryImpl implements JavascriptProxy
URI targetURI = URI.create(binding.getURI());
String targetPath = targetURI.getPath();
- if (targetPath.startsWith("/")) {
- targetPath = targetPath.substring(1);
- }
return "dojo.rpc.JsonService(\"" + targetPath + "?smd\")";
}
diff --git a/sca-java-2.x/trunk/samples/store/README b/sca-java-2.x/trunk/samples/store/README
index f9adec64cf..d31e4c59b7 100644
--- a/sca-java-2.x/trunk/samples/store/README
+++ b/sca-java-2.x/trunk/samples/store/README
@@ -25,4 +25,4 @@ ant run
Once the store application is running use your browser to visit the following
URL:
-http://localhost:8080/
+http://localhost:8080/store
diff --git a/sca-java-2.x/trunk/samples/store/src/main/resources/store.composite b/sca-java-2.x/trunk/samples/store/src/main/resources/store.composite
index eb0079ad84..9c3b79c508 100644
--- a/sca-java-2.x/trunk/samples/store/src/main/resources/store.composite
+++ b/sca-java-2.x/trunk/samples/store/src/main/resources/store.composite
@@ -25,7 +25,7 @@
<component name="Store">
<tuscany:implementation.widget location="uiservices/store.html"/>
<service name="Widget">
- <tuscany:binding.http uri="/"/>
+ <tuscany:binding.http uri="/store"/>
</service>
<reference name="catalog" target="Catalog"/>
<reference name="shoppingCart" target="ShoppingCart/Cart"/>