Author: slaws
Date: Tue Sep 14 15:34:54 2010
New Revision: 996954
URL: http://svn.apache.org/viewvc?rev=996954&view=rev
Log:
Currently the JSONP binding shouldn't directly rely on the HTTP binding runtime
as there is work to do to ensure that the HTTP binding has reference support
and JSONP wire format support (assuming we want to go that way). For now I've
ranked the JSONP provider higher than the HTTP provider so that the JSONP
runtime will always pick up the JSONP provider now that the JSONP model is an
instanceof both the HTTP model and the JSONP model. This should fix the NPE
reported on the ML for the short term.
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory?rev=996954&r1=996953&r2=996954&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
Tue Sep 14 15:34:54 2010
@@ -16,5 +16,5 @@
# under the License.
# Implementation class for the binding extension
-org.apache.tuscany.sca.binding.http.provider.HTTPBindingProviderFactory;model=org.apache.tuscany.sca.binding.http.HTTPBinding
+org.apache.tuscany.sca.binding.http.provider.HTTPBindingProviderFactory;model=org.apache.tuscany.sca.binding.http.HTTPBinding,ranking=100
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml?rev=996954&r1=996953&r2=996954&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml Tue Sep 14
15:34:54 2010
@@ -36,11 +36,11 @@
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory?rev=996954&r1=996953&r2=996954&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
Tue Sep 14 15:34:54 2010
@@ -16,5 +16,5 @@
# under the License.
# Implementation class for the binding extension
-org.apache.tuscany.sca.binding.jsonp.runtime.JSONPBindingProviderFactory;model=org.apache.tuscany.sca.binding.jsonp.JSONPBinding
+org.apache.tuscany.sca.binding.jsonp.runtime.JSONPBindingProviderFactory;model=org.apache.tuscany.sca.binding.jsonp.JSONPBinding,ranking=200
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java?rev=996954&r1=996953&r2=996954&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
Tue Sep 14 15:34:54 2010
@@ -70,7 +70,6 @@ public class BindingTestCase {
}
@Test
- //@Ignore("TUSCANY-3635")
public void testComplexParams() throws MalformedURLException, IOException {
HelloWorldService client = node.getService(HelloWorldService.class,
"HelloWorldClient/HelloWorldService/sca");
