diff options
7 files changed, 40 insertions, 136 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml index 89c83bad67..3f5ff6aaf0 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-jsonp/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly</artifactId> + <artifactId>tuscany-binding-http</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java index 8872d78fa6..45878f4f50 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java +++ b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java @@ -19,13 +19,20 @@ package org.apache.tuscany.sca.binding.jsonp; -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.binding.http.HTTPDefaultOperationSelector; +import org.apache.tuscany.sca.binding.http.HTTPDefaultWireFormat; +import org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl; /** * JSONP Binding model */ -public interface JSONPBinding extends Binding { - QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.jsonp"); +public class JSONPBinding extends HTTPBindingImpl { + public JSONPBinding() { + super(); + + // configure the HTTP binding for JSONP (which for the moment is the default wireFormat) + setOperationSelector(new HTTPDefaultOperationSelector()); + setRequestWireFormat(new HTTPDefaultWireFormat()); + setResponseWireFormat(new HTTPDefaultWireFormat()); + } } diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java index 2e8bebef0d..c94a66deed 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java +++ b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java @@ -19,13 +19,13 @@ package org.apache.tuscany.sca.binding.jsonp; + /** * Factory to create JSONPBinding instances */ -public interface JSONPBindingFactory { +public class JSONPBindingFactory { - /** - * Create JSONPBinding model - */ - JSONPBinding createJSONPBinding(); + public JSONPBinding createJSONPBinding() { + return new JSONPBinding(); + } } diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java deleted file mode 100644 index be74a28e39..0000000000 --- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.jsonp.impl; - -import org.apache.tuscany.sca.binding.jsonp.JSONPBinding; -import org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory; - -/** - * Factory implementation to create JSONP Models - */ -public class JSONPBindingFactoryImpl implements JSONPBindingFactory { - - public JSONPBinding createJSONPBinding() { - return new JSONPBindingImpl(); - } - -} diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java deleted file mode 100644 index 4d0f03fe4d..0000000000 --- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.binding.jsonp.impl; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.OperationSelector; -import org.apache.tuscany.sca.assembly.WireFormat; -import org.apache.tuscany.sca.binding.jsonp.JSONPBinding; - -/** - * Represents a binding to an RMI service. - * - * @version $Rev$ $Date$ - */ -public class JSONPBindingImpl implements JSONPBinding { - - private String name; - private String uri; - - public String getName() { - return name; - } - - public String getURI() { - return uri; - } - - public void setURI(String uri) { - this.uri = uri; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - public boolean isUnresolved() { - return false; - } - - public void setUnresolved(boolean arg0) { - } - - public QName getType() { - return TYPE; - } - - public WireFormat getRequestWireFormat() { - return null; - } - - public void setRequestWireFormat(WireFormat wireFormat) { - } - - public WireFormat getResponseWireFormat() { - return null; - } - - public void setResponseWireFormat(WireFormat wireFormat) { - } - - public OperationSelector getOperationSelector() { - return null; - } - - public void setOperationSelector(OperationSelector operationSelector) { - } - -} diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory index e1e8c6d3a5..57908b31d5 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory +++ b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory @@ -16,5 +16,6 @@ # under the License. # Implementation class for model factory -org.apache.tuscany.sca.binding.jsonp.impl.JSONPBindingFactoryImpl +org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory + diff --git a/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory new file mode 100644 index 0000000000..c45809a716 --- /dev/null +++ b/sca-java-2.x/trunk/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Implementation class for the binding extension
+org.apache.tuscany.sca.binding.http.provider.HTTPBindingProviderFactory;model=org.apache.tuscany.sca.binding.jsonp.JSONPBinding
+
|