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/08/01 23:42:45 UTC
svn commit: r681850 - in
/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata:
GDataBinding.java GDataImplementationProcessor.java
impl/GDataBindingImpl.java
Author: lresende
Date: Fri Aug 1 14:42:45 2008
New Revision: 681850
URL: http://svn.apache.org/viewvc?rev=681850&view=rev
Log:
TUSCANY-2494 - Applying Douglas patch
Modified:
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java
tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java
Modified: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java?rev=681850&r1=681849&r2=681850&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java Fri Aug 1 14:42:45 2008
@@ -39,11 +39,39 @@
*/
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);
}
Modified: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java?rev=681850&r1=681849&r2=681850&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java Fri Aug 1 14:42:45 2008
@@ -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 @@
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 @@
*/
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 @@
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();
}
}
Modified: tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.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?rev=681850&r1=681849&r2=681850&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java (original)
+++ tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GDataBindingImpl.java Fri Aug 1 14:42:45 2008
@@ -39,8 +39,9 @@
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 @@
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 @@
public void setPassword(String password) {
this.password = password;
}
+
+ public String getServiceType() {
+ return this.serviceType;
+ }
+
+ public void setServiceType(String serviceType) {
+ this.serviceType = serviceType;
+ }
}