You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/06/24 11:01:52 UTC
svn commit: r671075 - in /tuscany/java/sca/modules: binding-gdata-runtime/
binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/
binding-gdata-runtime/src/main/resources/META-INF/services/
binding-gdata-runtime/src/test/jav...
Author: lresende
Date: Tue Jun 24 02:01:51 2008
New Revision: 671075
URL: http://svn.apache.org/viewvc?rev=671075&view=rev
Log:
Refactoring GData binding to remove atom binding dependencies and to follow tuscany module name convention.
Added:
tuscany/java/sca/modules/binding-gdata/
- copied from r671053, tuscany/java/sca/modules/binding-atom/
tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java (contents, props changed)
- copied, changed from r671055, tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingInvoker.java
tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java (contents, props changed)
- copied, changed from r671055, tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingProviderFactory.java
tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java (contents, props changed)
- copied, changed from r671055, tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomReferenceBindingProvider.java
tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ (props changed)
- copied from r671055, tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java (contents, props changed)
- copied, changed from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java (contents, props changed)
- copied, changed from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/ (props changed)
- copied from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java (contents, props changed)
- copied, changed from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java (contents, props changed)
- copied, changed from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory (contents, props changed)
- copied, changed from r671053, tuscany/java/sca/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
Removed:
tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingInvoker.java
tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingProviderFactory.java
tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomReferenceBindingProvider.java
tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/atom/
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/AtomBindingFactoryImpl.java
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/AtomBindingImpl.java
tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
tuscany/java/sca/modules/binding-gdata/src/main/resources/org/
Modified:
tuscany/java/sca/modules/binding-gdata-runtime/pom.xml
tuscany/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
tuscany/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
tuscany/java/sca/modules/binding-gdata/pom.xml
tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Modified: tuscany/java/sca/modules/binding-gdata-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-runtime/pom.xml?rev=671075&r1=671074&r2=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-gdata-runtime/pom.xml Tue Jun 24 02:01:51 2008
@@ -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>
Copied: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java (from r671055, tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingInvoker.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java?p2=tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java&p1=tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingInvoker.java&r1=671055&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingInvoker.java (original)
+++ tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java Tue Jun 24 02:01:51 2008
@@ -39,13 +39,13 @@
*
* @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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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);
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java (from r671055, tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingProviderFactory.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java?p2=tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java&p1=tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingProviderFactory.java&r1=671055&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomBindingProviderFactory.java (original)
+++ tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java Tue Jun 24 02:01:51 2008
@@ -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 @@
*
* @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 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;
}
}
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java (from r671055, tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomReferenceBindingProvider.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java?p2=tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java&p1=tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomReferenceBindingProvider.java&r1=671055&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/AtomReferenceBindingProvider.java (original)
+++ tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java Tue Jun 24 02:01:51 2008
@@ -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.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 @@
* @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 @@
//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 @@
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() {
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: tuscany/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory?rev=671075&r1=671074&r2=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (original)
+++ tuscany/java/sca/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory Tue Jun 24 02:01:51 2008
@@ -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
Modified: tuscany/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java?rev=671075&r1=671074&r2=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java (original)
+++ tuscany/java/sca/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java Tue Jun 24 02:01:51 2008
@@ -25,7 +25,7 @@
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");
Propchange: tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite?rev=671075&r1=671055&r2=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite (original)
+++ tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite Tue Jun 24 02:01:51 2008
@@ -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>
Modified: tuscany/java/sca/modules/binding-gdata/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/pom.xml?rev=671075&r1=671053&r2=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata/pom.xml (original)
+++ tuscany/java/sca/modules/binding-gdata/pom.xml Tue Jun 24 02:01:51 2008
@@ -26,7 +26,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-binding-atom</artifactId>
+ <artifactId>tuscany-binding-gdata</artifactId>
<name>Apache Tuscany SCA Atom Feed Binding Extension</name>
<dependencies>
Copied: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java (from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java?p2=tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java&p1=tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java&r1=671053&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java Tue Jun 24 02:01:51 2008
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.atom;
+package org.apache.tuscany.sca.binding.gdata;
import org.apache.tuscany.sca.assembly.Binding;
/**
- * Atom binding model.
+ * GData binding model.
*
* @version $Rev$ $Date$
*/
-public interface AtomBinding extends Binding {
+public interface GDataBinding extends Binding {
/**
* Returns the title of the Atom collection.
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java (from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java?p2=tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java&p1=tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java&r1=671053&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java Tue Jun 24 02:01:51 2008
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.atom;
+package org.apache.tuscany.sca.binding.gdata;
/**
- * Factory for the Atom binding
+ * Factory for the GData binding
*
* @version $Rev$ $Date$
*/
-public interface AtomBindingFactory {
+public interface GDataBindingFactory {
/**
* Creates a new Atom binding.
* @return the new Atom binding
*/
- AtomBinding createAtomBinding();
+ GDataBinding createAtomBinding();
}
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java (from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java?p2=tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java&p1=tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java&r1=671053&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java Tue Jun 24 02:01:51 2008
@@ -17,20 +17,20 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.atom.impl;
+package org.apache.tuscany.sca.binding.gdata.impl;
-import org.apache.tuscany.sca.binding.atom.AtomBinding;
-import org.apache.tuscany.sca.binding.atom.AtomBindingFactory;
+import org.apache.tuscany.sca.binding.gdata.GDataBinding;
+import org.apache.tuscany.sca.binding.gdata.GDataBindingFactory;
/**
- * Factory for the Atom binding model.
+ * Factory for the GData binding model.
*
* @version $Rev$ $Date$
*/
-public class AtomBindingFactoryImpl implements AtomBindingFactory {
+public class GDataBindingFactoryImpl implements GDataBindingFactory {
- public AtomBinding createAtomBinding() {
- return new AtomBindingImpl();
+ public GDataBinding createAtomBinding() {
+ return new GDataBindingImpl();
}
}
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingFactoryImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java (from r671053, tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java?p2=tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java&p1=tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java&r1=671053&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java Tue Jun 24 02:01:51 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.binding.atom.impl;
+package org.apache.tuscany.sca.binding.gdata.impl;
import java.util.ArrayList;
import java.util.List;
@@ -26,18 +26,18 @@
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.binding.atom.AtomBinding;
+import org.apache.tuscany.sca.binding.gdata.GDataBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
/**
- * Implementation of the Atom Feed binding model.
+ * Implementation of the GData binding model.
*
* @version $Rev$ $Date$
*/
-class AtomBindingImpl implements AtomBinding, OptimizableBinding, PolicySetAttachPoint {
+class GDataBindingImpl implements GDataBinding, OptimizableBinding, PolicySetAttachPoint {
private String name;
private String uri;
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory (from r671053, tuscany/java/sca/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory?p2=tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory&p1=tuscany/java/sca/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory&r1=671053&r2=671075&rev=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory Tue Jun 24 02:01:51 2008
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the model factory
-org.apache.tuscany.sca.binding.atom.impl.AtomBindingFactoryImpl
\ No newline at end of file
+org.apache.tuscany.sca.binding.gdata.impl.GDataBindingFactoryImpl
\ No newline at end of file
Propchange: tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=671075&r1=671053&r2=671075&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Tue Jun 24 02:01:51 2008
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.atom,model=org.apache.tuscany.sca.binding.atom.AtomBinding,factory=org.apache.tuscany.sca.binding.atom.AtomBindingFactory
\ No newline at end of file
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.gdata,model=org.apache.tuscany.sca.binding.gdata.GDataBinding,factory=org.apache.tuscany.sca.binding.gdata.GDataBindingFactory
\ No newline at end of file