From 3a6a03b301a0ba0ef23b73288a19d2f1a6fb3c4d Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 1 Aug 2008 21:42:45 +0000
Subject: TUSCANY-2494 - Applying Douglas patch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681850 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/binding/gdata/GDataBinding.java    | 36 +++++++++++++++--
 .../gdata/GDataImplementationProcessor.java        | 46 +++++++++++++---------
 .../sca/binding/gdata/impl/GDataBindingImpl.java   | 19 ++++++---
 3 files changed, 73 insertions(+), 28 deletions(-)

(limited to 'java/sca/modules')

diff --git a/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java b/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
index 2c4022b166..c1868f05dc 100644
--- a/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
+++ b/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
@@ -39,11 +39,39 @@ public interface GDataBinding extends Binding {
      */
     void setTitle(String title);
 
-    String getLogin();
+    /*
+     * Returns the username of a Google account
+     * @return
+     */
+    String getUsername();
+
+    /*
+     * Sets the username of a Google account
+     * @param username
+     */
+    void setUsername(String username);
 
-    void setLogin(String login);
-    
+    /*
+     * Returns the password of a Google account
+     * @return
+     */
     String getPassword();
-    
+
+    /*
+     * Sets the password of a Google account
+     * @param password
+     */
     void setPassword(String password);
+
+    /*
+     * Retruns the name of the Google service to which we are connecting. Sample names of services might include "cl" (Calendar), "mail" (GMail), or "blogger" (Blogger)
+     * @return
+     */
+    String getServiceType();
+
+    /*
+     * Sets the name of the Google service to which we are connecting. Sample names of services might include "cl" (Calendar), "mail" (GMail), or "blogger" (Blogger)
+     * @param serviceType
+     */
+    void setServiceType(String serviceType);
 }
diff --git a/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java b/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java
index 39bbf110ed..5797629bed 100644
--- a/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java
+++ b/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java
@@ -1,18 +1,20 @@
 /*
- *  Copyright 2008 douglas.
+ * 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
  * 
- *  Licensed 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
  * 
- *       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.
- *  under the License.
+ * 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.gdata;
 
@@ -34,8 +36,8 @@ public class GDataImplementationProcessor implements StAXArtifactProcessor<GData
     protected static final QName BINDING_GDATA = new QName(Constants.SCA10_TUSCANY_NS, "binding.gdata");
 
     public GDataImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        
-        this.gdataFactory = modelFactories.getFactory(GDataBindingFactory.class);
+
+        this.gdataFactory = (GDataBindingFactory) modelFactories.getFactory(GDataBindingFactory.class);
     }
 
     public GDataBinding read(XMLStreamReader reader) {
@@ -51,11 +53,13 @@ public class GDataImplementationProcessor implements StAXArtifactProcessor<GData
          */
 
         String uri = reader.getAttributeValue(null, "uri");
-        String login = reader.getAttributeValue(null, "login");
+        String serviceType = reader.getAttributeValue(null, "serviceType");
+        String login = reader.getAttributeValue(null, "username");
         String password = reader.getAttributeValue(null, "password");
 
         gdataBinding.setURI(uri);
-        gdataBinding.setLogin(login);
+        gdataBinding.setServiceType(serviceType);
+        gdataBinding.setUsername(login);
         gdataBinding.setPassword(password);
 
         return gdataBinding;
@@ -68,13 +72,17 @@ public class GDataImplementationProcessor implements StAXArtifactProcessor<GData
             if (gdataBinding.getURI() != null) {
                 writer.writeAttribute("uri", gdataBinding.getURI());
             }
-            if (gdataBinding.getLogin() != null) {
-                writer.writeAttribute("login", gdataBinding.getLogin());
+
+            if (gdataBinding.getServiceType() != null) {
+                writer.writeAttribute("serviceType", gdataBinding.getServiceType());
+            }
+            if (gdataBinding.getUsername() != null) {
+                writer.writeAttribute("username", gdataBinding.getUsername());
             }
             if (gdataBinding.getPassword() != null) {
                 writer.writeAttribute("password", gdataBinding.getPassword());
             }
-
+            
             writer.writeEndElement();
         }
     }
diff --git a/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java b/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
index b2282419c0..3081816185 100644
--- a/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
+++ b/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
@@ -39,8 +39,9 @@ import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
 class GDataBindingImpl implements GDataBinding, OptimizableBinding, PolicySetAttachPoint {
 
     private String password;
-    private String login;
+    private String username;
     private String name;
+    private String serviceType;
     private String uri;
     private String title;
     private List<Intent> requiredIntents = new ArrayList<Intent>();
@@ -142,12 +143,12 @@ class GDataBindingImpl implements GDataBinding, OptimizableBinding, PolicySetAtt
         this.requiredIntents = intents;
     }
 
-    public String getLogin() {
-        return this.login;
+    public String getUsername() {
+        return this.username;
     }
 
-    public void setLogin(String login) {
-        this.login = login;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
     public String getPassword() {
@@ -157,4 +158,12 @@ class GDataBindingImpl implements GDataBinding, OptimizableBinding, PolicySetAtt
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getServiceType() {
+        return this.serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
 }
-- 
cgit v1.2.3