diff options
Diffstat (limited to 'java/sca/modules/binding-gdata-runtime')
7 files changed, 42 insertions, 47 deletions
diff --git a/java/sca/modules/binding-gdata-runtime/pom.xml b/java/sca/modules/binding-gdata-runtime/pom.xml index 3e9c960dc7..cf2a0aea63 100644 --- a/java/sca/modules/binding-gdata-runtime/pom.xml +++ b/java/sca/modules/binding-gdata-runtime/pom.xml @@ -25,13 +25,13 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>tuscany-binding-gdata</artifactId> + <artifactId>tuscany-binding-gdata-runtime</artifactId> <name>Apache Tuscany SCA GData Binding Extension</name> <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-atom</artifactId> + <artifactId>tuscany-binding-gdata</artifactId> <version>1.4-SNAPSHOT</version> </dependency> @@ -106,13 +106,6 @@ </dependency> <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.4-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.2</version> diff --git a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingInvoker.java b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java index 0834140f69..ebf0595c9d 100644 --- a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingInvoker.java +++ b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java @@ -39,13 +39,13 @@ import org.apache.tuscany.sca.invocation.DataExchangeSemantics; * * @version $Rev$ $Date$ */ -class AtomBindingInvoker implements Invoker { +class GDataBindingInvoker implements Invoker { Operation operation; String uri; GoogleService service; - AtomBindingInvoker(Operation operation, String uri, GoogleService service) { + GDataBindingInvoker(Operation operation, String uri, GoogleService service) { this.operation = operation; this.uri = uri; this.service = service; @@ -61,7 +61,7 @@ class AtomBindingInvoker implements Invoker { /** * Get operation invoker */ - public static class GetInvoker extends AtomBindingInvoker { + public static class GetInvoker extends GDataBindingInvoker { public GetInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); @@ -90,7 +90,7 @@ class AtomBindingInvoker implements Invoker { /** * Post operation invoker */ - public static class PostInvoker extends AtomBindingInvoker { + public static class PostInvoker extends GDataBindingInvoker { public PostInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); @@ -119,7 +119,7 @@ class AtomBindingInvoker implements Invoker { /** * Put operation invoker */ - public static class PutInvoker extends AtomBindingInvoker { + public static class PutInvoker extends GDataBindingInvoker { public PutInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); @@ -150,7 +150,7 @@ class AtomBindingInvoker implements Invoker { /** * Delete operation invoker */ - public static class DeleteInvoker extends AtomBindingInvoker { + public static class DeleteInvoker extends GDataBindingInvoker { public DeleteInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); @@ -175,7 +175,7 @@ class AtomBindingInvoker implements Invoker { /** * GetAll operation invoker */ - public static class GetAllInvoker extends AtomBindingInvoker { + public static class GetAllInvoker extends GDataBindingInvoker { public GetAllInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); @@ -205,7 +205,7 @@ class AtomBindingInvoker implements Invoker { /** * Query operation invoker */ - public static class QueryInvoker extends AtomBindingInvoker { + public static class QueryInvoker extends GDataBindingInvoker { public QueryInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); @@ -221,7 +221,7 @@ class AtomBindingInvoker implements Invoker { /** * PostMedia operation invoker */ - public static class PostMediaInvoker extends AtomBindingInvoker { + public static class PostMediaInvoker extends GDataBindingInvoker { public PostMediaInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); @@ -237,7 +237,7 @@ class AtomBindingInvoker implements Invoker { /** * PutMedia operation invoker */ - public static class PutMediaInvoker extends AtomBindingInvoker { + public static class PutMediaInvoker extends GDataBindingInvoker { public PutMediaInvoker(Operation operation, String uri, GoogleService service) { super(operation, uri, service); diff --git a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingProviderFactory.java b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java index d1ff2121db..f080bf24db 100644 --- a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingProviderFactory.java +++ b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.binding.gdata.provider; -import org.apache.tuscany.sca.binding.atom.AtomBinding; +import org.apache.tuscany.sca.binding.gdata.GDataBinding; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; @@ -41,13 +41,13 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService; * * @version $Rev$ $Date$ */ -public class AtomBindingProviderFactory implements BindingProviderFactory<AtomBinding> { +public class GDataBindingProviderFactory implements BindingProviderFactory<GDataBinding> { private MessageFactory messageFactory; private Mediator mediator; private ServletHost servletHost; - public AtomBindingProviderFactory(ExtensionPointRegistry extensionPoints) { + public GDataBindingProviderFactory(ExtensionPointRegistry extensionPoints) { ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class); this.servletHost = servletHosts.getServletHosts().get(0); ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); @@ -58,20 +58,20 @@ public class AtomBindingProviderFactory implements BindingProviderFactory<AtomBi public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, - AtomBinding binding) { - return new AtomReferenceBindingProvider(component, reference, binding); + GDataBinding binding) { + return new GDataReferenceBindingProvider(component, reference, binding); } public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, - AtomBinding binding) { + GDataBinding binding) { //return new AtomServiceBindingProvider(component, service, binding, servletHost, messageFactory, mediator); //FIXME - To implement AtomServiceBindingProvider return null; } - public Class<AtomBinding> getModelType() { - return AtomBinding.class; + public Class<GDataBinding> getModelType() { + return GDataBinding.class; } } diff --git a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomReferenceBindingProvider.java b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java index 0a2dd4ffb1..b1d6e4a3a4 100644 --- a/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomReferenceBindingProvider.java +++ b/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java @@ -18,11 +18,10 @@ */ package org.apache.tuscany.sca.binding.gdata.provider; -import com.google.gdata.client.GoogleService; -import com.google.gdata.util.AuthenticationException; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.tuscany.sca.binding.atom.AtomBinding; + +import org.apache.tuscany.sca.binding.gdata.GDataBinding; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Invoker; @@ -30,15 +29,18 @@ import org.apache.tuscany.sca.provider.ReferenceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; +import com.google.gdata.client.GoogleService; +import com.google.gdata.util.AuthenticationException; + /** * Implementation of the Atom binding provider. * * @version $Rev$ $Date$ */ -class AtomReferenceBindingProvider implements ReferenceBindingProvider { +class GDataReferenceBindingProvider implements ReferenceBindingProvider { private RuntimeComponentReference reference; - private AtomBinding binding; + private GDataBinding binding; private GoogleService service; /** @@ -48,9 +50,9 @@ class AtomReferenceBindingProvider implements ReferenceBindingProvider { * @param binding * @param mediator */ - AtomReferenceBindingProvider(RuntimeComponent component, + GDataReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, - AtomBinding binding) { + GDataBinding binding) { this.reference = reference; this.binding = binding; @@ -61,7 +63,7 @@ class AtomReferenceBindingProvider implements ReferenceBindingProvider { //FIXME - Get credentials automatically service.setUserCredentials("gsocstudent2008@gmail.com", "gsoc2008"); } catch (AuthenticationException ex) { - Logger.getLogger(AtomReferenceBindingProvider.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(GDataReferenceBindingProvider.class.getName()).log(Level.SEVERE, null, ex); } this.service.setConnectTimeout(60000); @@ -71,24 +73,24 @@ class AtomReferenceBindingProvider implements ReferenceBindingProvider { String operationName = operation.getName(); if (operationName.equals("get")) { - return new AtomBindingInvoker.GetInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.GetInvoker(operation, binding.getURI(), service); } else if (operationName.equals("post")) { - return new AtomBindingInvoker.PostInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.PostInvoker(operation, binding.getURI(), service); } else if (operationName.equals("put")) { - return new AtomBindingInvoker.PutInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.PutInvoker(operation, binding.getURI(), service); } else if (operationName.equals("delete")) { - return new AtomBindingInvoker.DeleteInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.DeleteInvoker(operation, binding.getURI(), service); } else if (operationName.equals("getFeed") || operationName.equals("getAll")) { - return new AtomBindingInvoker.GetAllInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.GetAllInvoker(operation, binding.getURI(), service); } else if (operationName.equals("postMedia")) { - return new AtomBindingInvoker.PostMediaInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.PostMediaInvoker(operation, binding.getURI(), service); } else if (operationName.equals("putMedia")) { - return new AtomBindingInvoker.PutMediaInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.PutMediaInvoker(operation, binding.getURI(), service); } else if (operationName.equals("query")) { - return new AtomBindingInvoker.QueryInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker.QueryInvoker(operation, binding.getURI(), service); } - return new AtomBindingInvoker(operation, binding.getURI(), service); + return new GDataBindingInvoker(operation, binding.getURI(), service); } public InterfaceContract getBindingInterfaceContract() { diff --git a/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory index 7957c636cc..7b655eb6b7 100644 --- a/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory +++ b/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory @@ -16,4 +16,4 @@ # under the License.
# Implementation class for the binding extension
-org.apache.tuscany.sca.binding.gdata.provider.AtomBindingProviderFactory;model=org.apache.tuscany.sca.binding.atom.AtomBinding
+org.apache.tuscany.sca.binding.gdata.provider.GDataBindingProviderFactory;model=org.apache.tuscany.sca.binding.gdata.GDataBinding
diff --git a/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java b/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java index d127bca3f2..2eef368c26 100644 --- a/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java +++ b/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java @@ -25,7 +25,7 @@ public class Consumer { public static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/Consumer.composite"); + SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Consumer.composite"); CustomerClient testService = scaDomain.getService(CustomerClient.class, "CustomerClient"); diff --git a/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite index 1ba79ed569..23d669ff0c 100644 --- a/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite +++ b/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite @@ -25,7 +25,7 @@ <component name="CustomerClient"> <implementation.java class="org.apache.tuscany.sca.binding.gdata.CustomerClientImpl"/> <reference name="resourceCollection"> - <tuscany:binding.atom uri="http://www.google.com/calendar/feeds/gsocstudent2008@gmail.com/private/full"/> + <tuscany:binding.gdata uri="http://www.google.com/calendar/feeds/gsocstudent2008@gmail.com/private/full"/> </reference> </component> |