Author: lresende
Date: Mon Oct 27 23:34:31 2008
New Revision: 708460
URL: http://svn.apache.org/viewvc?rev=708460&view=rev
Log:
Cleaning up GData binding implementation and fixing issue with retrieving
Picassa feed
Removed:
tuscany/branches/sca-equinox/modules/binding-gdata2/
tuscany/branches/sca-equinox/modules/binding-gdata2-runtime/
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
tuscany/branches/sca-equinox/modules/pom.xml
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
Mon Oct 27 23:34:31 2008
@@ -20,13 +20,14 @@
import java.io.InputStream;
-import org.osoa.sca.annotations.Remotable; // import
- // org.apache.abdera.model.Entry;
+import org.osoa.sca.annotations.Remotable;
import com.google.gdata.data.Entry;
/**
* Provides access to a collection of resources using Atom.
+ *
+ * @version $Rev$ $Date$
*/
@Remotable
public interface MediaCollection extends Collection {
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
Mon Oct 27 23:34:31 2008
@@ -24,6 +24,7 @@
*
* @version $Rev$ $Date$
*/
+
public class NotFoundException extends Exception {
private static final long serialVersionUID = -5046027674128627383L;
@@ -41,5 +42,4 @@
public NotFoundException(String message, Throwable cause) {
super(message, cause);
}
-
}
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
Mon Oct 27 23:34:31 2008
@@ -46,6 +46,8 @@
/**
* Invoker for the GData binding.
+ *
+ * @version $Rev$ $Date$
*/
class GdataBindingInvoker implements Invoker, DataExchangeSemantics {
@@ -71,6 +73,11 @@
}
+
+ public boolean allowsPassByReference() {
+ return true;
+ }
+
public Message invoke(Message msg) {
// Shouldn't get here, as the only supported methods are
// defined in the ResourceCollection interface, and implemented
@@ -83,6 +90,7 @@
* Get operation invoker
*/
public static class GetInvoker extends GdataBindingInvoker {
+
public GetInvoker(Operation operation,
String uri,
GoogleService googleService,
@@ -145,23 +153,19 @@
// Expect an GData entry
- System.out.println("[Debug
Info]GdataBindingInvoker.PostInvoker --- supportsFeedEntries: " + provider
- .supportsFeedEntries());
+ System.out.println("[Debug
Info]GdataBindingInvoker.PostInvoker --- supportsFeedEntries: " +
provider.supportsFeedEntries());
feedEntry = (com.google.gdata.data.Entry)args[0];
- System.out.println("[Debug
Info]GdataBindingInvoker.PostInvoker --- feedEntry title: " + feedEntry
- .getTitle().getPlainText());
+ System.out.println("[Debug
Info]GdataBindingInvoker.PostInvoker --- feedEntry title: " +
feedEntry.getTitle().getPlainText());
} else {
// Expect a key and data item
Entry<Object, Object> entry = new Entry<Object,
Object>(args[0], args[1]);
// FIXME: this needs to be examinated more....
- feedEntry =
- feedEntry(entry, provider.getItemClassType(),
provider.getItemXMLType(), provider.getMediator());
+ feedEntry = feedEntry(entry, provider.getItemClassType(),
provider.getItemXMLType(), provider.getMediator());
}
-
try {
com.google.gdata.data.Entry createdEntry =
googleService.insert(new URL(uri), feedEntry);
@@ -212,13 +216,6 @@
id = (String)args[0];
Entry<Object, Object> entry = new Entry<Object, Object>(id,
args[1]);
- // FIXME: The following statement needs to be modified
- // accordingly
- /*
- * feedEntry = feedEntry(entry, provider.getItemClassType(),
- * provider.getItemXMLType(), provider.getMediator(),
- * abderaFactory);
- */
}
// Send an HTTP PUT <Localhost>
@@ -309,7 +306,7 @@
}
@SuppressWarnings("finally")
- @Override
+ @Override
public Message invoke(Message msg) {
// Send an HTTP GET
@@ -351,7 +348,7 @@
}
@SuppressWarnings("finally")
- @Override
+ @Override
public Message invoke(Message msg) {
// Send an HTTP GET
@@ -365,7 +362,7 @@
try {
- Feed resultFeed = googleService.query(myQuery, Feed.class);
+ Feed resultFeed = googleService.query(myQuery, Feed.class);
msg.setBody(resultFeed);
} catch (ResourceNotFoundException ex) {
@@ -425,10 +422,4 @@
return super.invoke(msg);
}
}
-
- public boolean allowsPassByReference() {
- // TODO Auto-generated method stub
- return true;
- }
-
-}
+}
\ No newline at end of file
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
Mon Oct 27 23:34:31 2008
@@ -58,9 +58,12 @@
import com.google.gdata.data.PlainTextConstruct;
import com.google.gdata.util.ServiceException;
+
/**
* A resource collection binding listener, implemented as a Servlet and
* registered in a Servlet host provided by the SCA hosting runtime.
+ *
+ * @version $Rev$ $Date$
*/
class GdataBindingListenerServlet extends HttpServlet {
private static final Logger logger =
Logger.getLogger(GdataBindingListenerServlet.class.getName());
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
Mon Oct 27 23:34:31 2008
@@ -40,6 +40,8 @@
/**
* Implementation of a Binding provider factory for the Atom binding.
+ *
+ * @version $Rev$ $Date$
*/
public class GdataBindingProviderFactory implements
BindingProviderFactory<GdataBinding> {
@@ -63,7 +65,6 @@
try {
return new GdataReferenceBindingProvider(component, reference,
binding, mediator);
} catch (AuthenticationException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
return null; //Google authentication error! : This exception needs
to be handled into a better way
}
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
Mon Oct 27 23:34:31 2008
@@ -33,6 +33,7 @@
/**
* Utility methods used in this package.
*
+ * @version $Rev$ $Date$
*/
class GdataBindingUtil {
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
Mon Oct 27 23:34:31 2008
@@ -83,7 +83,6 @@
String authorization = "admin" + ":" + "admin";
authorizationHeader = "Basic " + new
String(Base64.encodeBase64(authorization.getBytes()));
-
// Prepare gdata header
String serviceType = binding.getServiceType();
String usernane = binding.getUsername();
@@ -97,8 +96,6 @@
if(binding.getUsername().equals("admin") == false &&
binding.getPassword().equals("admin")==false){
googleService.setUserCredentials(binding.getUsername(),binding.getPassword());
}
-
-
// Create an HTTP client
HttpConnectionManager connectionManager = new
MultiThreadedHttpConnectionManager();
@@ -111,9 +108,6 @@
String operationName = operation.getName();
- //
//System.out.println("GdataReferenceBindingProvider.createInvoker---operationName:"
- // + operationName);
-
if (operationName.equals("get")) {
// Determine the collection item type
@@ -128,7 +122,12 @@
supportsFeedEntries = true;
}
- return new GdataBindingInvoker.GetInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader, this);
+ String entryURI = this.binding.getURI();
+ if(entryURI.contains("picasaweb.google.com/data/feed/api/")){
+ entryURI =
entryURI.replace("picasaweb.google.com/data/feed/api/",
"picasaweb.google.com/data/entry/api/");
+ }
+
+ return new GdataBindingInvoker.GetInvoker(operation, entryURI,
googleService, httpClient, authorizationHeader, this);
} else if (operationName.equals("post")) {
@@ -136,53 +135,51 @@
} else if (operationName.equals("put")) {
- return new GdataBindingInvoker.PutInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader,
- this);
+ String entryURI = this.binding.getURI();
+ if(entryURI.contains("picasaweb.google.com/data/feed/api/")){
+ entryURI =
entryURI.replace("picasaweb.google.com/data/feed/api/",
"picasaweb.google.com/data/entry/api/");
+ }
+
+ return new GdataBindingInvoker.PutInvoker(operation, entryURI,
googleService, httpClient, authorizationHeader, this);
+
} else if (operationName.equals("delete")) {
- return new GdataBindingInvoker.DeleteInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader,
- this);
- } else if (operationName.equals("getFeed") ||
operationName.equals("getAll")) {
- // //System.out.println("GdataReferenceBindingProvider
- // CreateInvoker: getFeed or getAll");
+ String entryURI = this.binding.getURI();
+ if(entryURI.contains("picasaweb.google.com/data/feed/api/")){
+ entryURI =
entryURI.replace("picasaweb.google.com/data/feed/api/",
"picasaweb.google.com/data/entry/api/");
+ }
+ return new GdataBindingInvoker.DeleteInvoker(operation, entryURI,
googleService, httpClient, authorizationHeader, this);
+
+ } else if (operationName.equals("getFeed") ||
operationName.equals("getAll")) {
- return new GdataBindingInvoker.GetAllInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader,
- this);
+ return new GdataBindingInvoker.GetAllInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader, this);
} else if (operationName.equals("postMedia")) {
- return new GdataBindingInvoker.PostMediaInvoker(operation,
binding.getURI(), googleService, httpClient,
-
authorizationHeader, this);
+
+ return new GdataBindingInvoker.PostMediaInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader, this);
+
} else if (operationName.equals("putMedia")) {
- return new GdataBindingInvoker.PutMediaInvoker(operation,
binding.getURI(), googleService, httpClient,
-
authorizationHeader, this);
+
+ return new GdataBindingInvoker.PutMediaInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader, this);
+
} else if (operationName.equals("query")) {
- return new GdataBindingInvoker.QueryInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader,
- this);
+
+ return new GdataBindingInvoker.QueryInvoker(operation,
binding.getURI(), googleService, httpClient, authorizationHeader, this);
}
return new GdataBindingInvoker(operation, binding.getURI(),
googleService, httpClient, authorizationHeader, this);
}
-
-
public InterfaceContract getBindingInterfaceContract() {
return reference.getInterfaceContract();
}
-
-
public void start() {
-
// Configure the HTTP client credentials
Credentials credentials = new UsernamePasswordCredentials("admin",
"admin");
httpClient.getParams().setAuthenticationPreemptive(true);
URI uri = URI.create(binding.getURI());
httpClient.getState().setCredentials(new AuthScope(uri.getHost(),
uri.getPort()), credentials);
-
- // Find the get operation on the reference interface
- if (true) {
- return;
- }
}
public void stop() {
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
Mon Oct 27 23:34:31 2008
@@ -40,10 +40,39 @@
*/
void setTitle(String title);
+ /**
+ * Returns the username to be used when authenticating with GData Services
+ * @return
+ */
String getUsername();
+
+ /**
+ * Sets the username to be used when authenticating with GData Services
+ * @param username
+ */
+ void setUsername(String username);
+
+ /**
+ * Returns the password to be used when authenticating with GData Services
+ * @return
+ */
String getPassword();
- String getServiceType();
- void setUsername(String username);
+
+ /**
+ * Sets the password to be used when authenticating with GData Services
+ * @param password
+ */
void setPassword(String password);
+
+ /**
+ * Returns the type os service being used
+ * @return
+ */
+ String getServiceType();
+
+ /**
+ * Sets the type of service being used
+ * @param serviceType
+ */
void setServiceType(String serviceType);
}
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
Mon Oct 27 23:34:31 2008
@@ -22,6 +22,7 @@
/**
* Factory for the GData binding
*
+ * @version $Rev$ $Date$
*/
public interface GdataBindingFactory {
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
Mon Oct 27 23:34:31 2008
@@ -25,6 +25,7 @@
/**
* Factory for the GData binding model.
*
+ * @version $Rev$ $Date$
*/
public class GdataBindingFactoryImpl implements GdataBindingFactory {
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
Mon Oct 27 23:34:31 2008
@@ -22,10 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.assembly.Binding;
-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.gdata.GdataBinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -35,6 +31,7 @@
/**
* Implementation of the GData binding model.
*
+ * @version $Rev$ $Date$
*/
class GdataBindingImpl implements GdataBinding, PolicySetAttachPoint {
@@ -44,15 +41,12 @@
private String username;
private String password;
private String serviceType;
+
private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<PolicySet> policySets = new ArrayList<PolicySet>();
private IntentAttachPointType intentAttachPointType;
private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
- public List<PolicySet> getApplicablePolicySets() {
- return applicablePolicySets;
- }
-
public String getName() {
return name;
}
@@ -61,6 +55,10 @@
return uri;
}
+ public String getTitle() {
+ return title;
+ }
+
public String getUsername(){
return username;
}
@@ -80,6 +78,10 @@
public void setURI(String uri) {
this.uri = uri;
}
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
public void setUsername(String username) {
this.username = username;
@@ -93,15 +95,6 @@
this.serviceType = serviceType;
}
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
public boolean isUnresolved() {
// The binding is always resolved
return false;
@@ -111,6 +104,12 @@
// The binding is always resolved
}
+ //Policy related getters/setters
+
+ public List<PolicySet> getApplicablePolicySets() {
+ return applicablePolicySets;
+ }
+
public List<PolicySet> getPolicySets() {
return policySets;
}
@@ -139,4 +138,4 @@
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
-}
+}
\ No newline at end of file
Modified:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java
Mon Oct 27 23:34:31 2008
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.sca.binding.gdata.xml;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -34,27 +31,21 @@
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
/**
* A processor for <binding.gdata> elements.
+ *
+ * @version $Rev$ $Date$
*/
public class GdataBindingProcessor implements
StAXArtifactProcessor<GdataBinding> {
private QName BINDING_GDATA = new
QName("http://tuscany.apache.org/xmlns/sca/1.0";, "binding.gdata");
private final GdataBindingFactory factory;
- private IntentAttachPointTypeFactory intentAttachPointTypeFactory;
- //private PolicyAttachPointProcessor policyProcessor;
-
public GdataBindingProcessor(FactoryExtensionPoint modelFactories) {
this.factory = modelFactories.getFactory(GdataBindingFactory.class);
- this.intentAttachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
+ System.out.println("[Debug Info]GdataBindingProcessor reached");
}
public QName getArtifactType() {
@@ -67,90 +58,64 @@
public GdataBinding read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
GdataBinding gdataBinding = factory.createGdataBinding();
- IntentAttachPointType bindingType =
intentAttachPointTypeFactory.createBindingType();
- bindingType.setName(getArtifactType());
- bindingType.setUnresolved(true);
- ((PolicySetAttachPoint)gdataBinding).setType(bindingType);
String name = reader.getAttributeValue(null, "name");
if (name != null) {
- gdataBinding.setName(name);
+ gdataBinding.setName(name);
}
String uri = reader.getAttributeValue(null, "uri");
if (uri != null) {
- gdataBinding.setURI(uri);
+ gdataBinding.setURI(uri);
}
-
+
String serviceType = reader.getAttributeValue(null, "serviceType");
if (serviceType != null) {
- gdataBinding.setServiceType(serviceType);
+ gdataBinding.setServiceType(serviceType);
}
-
+
String username = reader.getAttributeValue(null, "username");
if (username != null) {
- gdataBinding.setUsername(username);
+ gdataBinding.setUsername(username);
}
-
+
String password = reader.getAttributeValue(null, "password");
if (password != null) {
- gdataBinding.setPassword(password);
+ gdataBinding.setPassword(password);
}
-
- //policyProcessor.readPolicies(echoBinding, reader);
+
return gdataBinding;
}
public void write(GdataBinding gdataBinding, XMLStreamWriter writer)
throws ContributionWriteException, XMLStreamException {
-
- //policyProcessor.writePolicyPrefixes(gdataBinding, writer);
writer.writeStartElement(BINDING_GDATA.getNamespaceURI(),
BINDING_GDATA.getLocalPart());
- //policyProcessor.writePolicyAttributes(gdataBinding, writer);
-
+
if (gdataBinding.getName() != null) {
- writer.writeAttribute("name", gdataBinding.getName());
+ writer.writeAttribute("name", gdataBinding.getName());
}
-
+
if (gdataBinding.getURI() != null) {
- writer.writeAttribute("uri", gdataBinding.getURI());
+ writer.writeAttribute("uri", gdataBinding.getURI());
}
-
+
if (gdataBinding.getServiceType() != null) {
- writer.writeAttribute("serviceType",
gdataBinding.getServiceType());
+ writer.writeAttribute("serviceType",
gdataBinding.getServiceType());
}
-
+
if (gdataBinding.getUsername() != null) {
- writer.writeAttribute("username", gdataBinding.getUsername());
+ writer.writeAttribute("username", gdataBinding.getUsername());
}
-
+
if (gdataBinding.getPassword() != null) {
- writer.writeAttribute("password", gdataBinding.getPassword());
+ writer.writeAttribute("password", gdataBinding.getPassword());
}
-
+
writer.writeEndElement();
}
- //FIXME: Resolve the attached policySet, might not needed (the echo
binding implementation example)
public void resolve(GdataBinding gdataBinding, ModelResolver resolver)
throws ContributionResolveException {
- PolicySetAttachPoint policySetAttachPoint =
(PolicySetAttachPoint)gdataBinding;
- List<Intent> requiredIntents = new ArrayList<Intent>();
- Intent resolvedIntent = null;
- for ( Intent intent : policySetAttachPoint.getRequiredIntents() ) {
- resolvedIntent = resolver.resolveModel(Intent.class, intent);
- requiredIntents.add(resolvedIntent);
- }
- policySetAttachPoint.getRequiredIntents().clear();
- policySetAttachPoint.getRequiredIntents().addAll(requiredIntents);
-
- List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
- PolicySet resolvedPolicySet = null;
- for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {
- resolvedPolicySet = resolver.resolveModel(PolicySet.class,
policySet);
- resolvedPolicySets.add(resolvedPolicySet);
- }
- policySetAttachPoint.getPolicySets().clear();
- policySetAttachPoint.getPolicySets().addAll(resolvedPolicySets);
+
}
}
Modified: tuscany/branches/sca-equinox/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/pom.xml?rev=708460&r1=708459&r2=708460&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/pom.xml Mon Oct 27 23:34:31 2008
@@ -51,8 +51,6 @@
<module>binding-atom-abdera</module>
<module>binding-gdata</module>
<module>binding-gdata-runtime</module>
- <module>binding-gdata2</module>
- <module>binding-gdata2-runtime</module>
<module>binding-http</module>
<module>binding-http-runtime</module>
<module>binding-jms</module>
