Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835122 13f79535-47bb-0310-9956-ffa450edef68

21 files changed, 2067 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
new file mode 100644
index 0000000000..85ee25bf42
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
@@ -0,0 +1,28 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed;
+
+import org.apache.tuscany.sca.assembly.Binding;
+
+/**
+ * Atom binding model.
+ */
+public interface AtomBinding extends Binding {
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
new file mode 100644
index 0000000000..050ba9b73c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
@@ -0,0 +1,35 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed;
+
+/**
+ * Factory for the Atom binding
+ *
+ * @version $Rev$ $Date$
+ */
+public interface AtomBindingFactory {
+
+    /**
+     * Creates a new Atom binding.
+     * @return the new Atom binding
+     */
+    AtomBinding createAtomBinding();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
new file mode 100644
index 0000000000..a71205ea77
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
@@ -0,0 +1,28 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed;
+
+import org.apache.tuscany.sca.assembly.Binding;
+
+/**
+ * RSS Feed binding model.
+ */
+public interface RSSBinding extends Binding {
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
new file mode 100644
index 0000000000..c95c8ac012
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
@@ -0,0 +1,35 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed;
+
+/**
+ * Factory for the RSS binding
+ *
+ * @version $Rev$ $Date$
+ */
+public interface RSSBindingFactory {
+
+    /**
+     * Creates a new RSS binding.
+     * @return the new RSS binding
+     */
+    RSSBinding createRSSBinding();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
new file mode 100644
index 0000000000..4cd48fd938
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
@@ -0,0 +1,73 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+package org.apache.tuscany.sca.binding.feed.collection;
+
+import org.osoa.sca.annotations.Remotable;
+
+import com.sun.syndication.feed.atom.Entry;
+
+/**
+ * Provides access to a collection of resources using Atom.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface Collection {
+
+    /**
+     * Get an RSS or Atom feed for a collection of resources.
+     * 
+     * @param uri the uri of the feed
+     * @return the RSS or Atom feed
+     */
+    com.sun.syndication.feed.atom.Feed getFeed();
+
+    /**
+     * Creates a new entry.
+     * 
+     * @param entry
+     * @return
+     */
+    Entry post(Entry entry);
+
+    /**
+     * Retrieves an entry.
+     * 
+     * @param id
+     * @return
+     */
+    Entry get(String id) throws NotFoundException;
+
+    /**
+     * Update an entry.
+     * 
+     * @param id
+     * @param entry
+     * @return
+     */
+    Entry put(String id, Entry entry) throws NotFoundException;
+
+    /**
+     * Delete an entry.
+     * 
+     * @param id
+     */
+    void delete(String id) throws NotFoundException;
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
new file mode 100644
index 0000000000..09942bcc23
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+package org.apache.tuscany.sca.binding.feed.collection;
+
+import java.io.InputStream;
+
+import org.osoa.sca.annotations.Remotable;
+
+import com.sun.syndication.feed.atom.Entry;
+
+/**
+ * Provides access to a collection of resources using Atom.
+ * 
+ * @version $Rev$ $Date$
+ */
+@Remotable
+public interface MediaCollection extends Collection {
+
+    /**
+     * Creates a new media entry
+     * 
+     * @param title
+     * @param slug
+     * @param contentType
+     * @param media
+     */
+    Entry postMedia(String title, String slug, String contentType, InputStream media);
+
+    /**
+     * Update a media entry.
+     * 
+     * @param id
+     * @param contentType
+     * @param media
+     * @return
+     */
+    Entry putMedia(String id, String contentType, InputStream media) throws NotFoundException;
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
new file mode 100644
index 0000000000..503f30e685
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.collection;
+
+/**
+ * Indicates that a resource could not be found.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class NotFoundException extends Exception {
+    private static final long serialVersionUID = -5046027674128627383L;
+
+    public NotFoundException() {
+    }
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+
+    public NotFoundException(Throwable cause) {
+        super(cause);
+    }
+
+    public NotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
new file mode 100644
index 0000000000..a9a1167544
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
@@ -0,0 +1,36 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.impl;
+
+import org.apache.tuscany.sca.binding.feed.AtomBinding;
+import org.apache.tuscany.sca.binding.feed.AtomBindingFactory;
+
+/**
+ * Factory for the Atom binding model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class AtomBindingFactoryImpl implements AtomBindingFactory {
+
+    public AtomBinding createAtomBinding() {
+        return new AtomBindingImpl();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
new file mode 100644
index 0000000000..61ed6ff96d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
@@ -0,0 +1,83 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.binding.feed.AtomBinding;
+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.
+ */
+class AtomBindingImpl implements AtomBinding, PolicySetAttachPoint {
+
+    private String name;
+    private String uri;
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
+    private List<PolicySet> policySets = new ArrayList<PolicySet>();
+    private IntentAttachPointType intentAttachPointType;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getURI() {
+        return uri;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setURI(String uri) {
+        this.uri = uri;
+    }
+
+
+    public boolean isUnresolved() {
+        // The binding is always resolved
+        return false;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        // The binding is always resolved
+    }
+
+    public List<PolicySet> getPolicySets() {
+        return policySets;
+    }
+    
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
+
+    public IntentAttachPointType getType() {
+        return intentAttachPointType;
+    }
+    
+    public void setType(IntentAttachPointType intentAttachPointType) {
+        this.intentAttachPointType = intentAttachPointType;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
new file mode 100644
index 0000000000..4d8fb943f0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
@@ -0,0 +1,36 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.impl;
+
+import org.apache.tuscany.sca.binding.feed.RSSBinding;
+import org.apache.tuscany.sca.binding.feed.RSSBindingFactory;
+
+/**
+ * Factory for the RSS binding model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class RSSBindingFactoryImpl implements RSSBindingFactory {
+
+    public RSSBinding createRSSBinding() {
+        return new RSSBindingImpl();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
new file mode 100644
index 0000000000..3e9dc2d66b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
@@ -0,0 +1,81 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.binding.feed.RSSBinding;
+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 RSS Feed binding model.
+ */
+class RSSBindingImpl implements RSSBinding, PolicySetAttachPoint {
+
+    private String name;
+    private String uri;
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
+    private List<PolicySet> policySets = new ArrayList<PolicySet>();
+    private IntentAttachPointType intentAttachPointType;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getURI() {
+        return uri;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setURI(String uri) {
+        this.uri = uri;
+    }
+
+    public boolean isUnresolved() {
+        return false;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        // The binding is always resolved
+    }
+
+    public List<PolicySet> getPolicySets() {
+        return policySets;
+    }
+    
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
+
+    public IntentAttachPointType getType() {
+        return intentAttachPointType;
+    }
+    
+    public void setType(IntentAttachPointType intentAttachPointType) {
+        this.intentAttachPointType = intentAttachPointType;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
new file mode 100644
index 0000000000..c684970136
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
@@ -0,0 +1,350 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.tuscany.sca.binding.feed.collection.NotFoundException;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+import org.osoa.sca.ServiceRuntimeException;
+
+import com.sun.syndication.feed.atom.Entry;
+import com.sun.syndication.feed.atom.Feed;
+import com.sun.syndication.io.WireFeedInput;
+import com.sun.syndication.io.XmlReader;
+
+/**
+ * Invoker for the Atom binding.
+ */
+class AtomBindingInvoker implements Invoker {
+
+    Operation operation;
+    String uri;
+    HttpClient httpClient;
+    String authorizationHeader;
+
+    AtomBindingInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+        this.operation = operation;
+        this.uri = uri;
+        this.httpClient = httpClient;
+        this.authorizationHeader = authorizationHeader;
+    }
+
+    public Message invoke(Message msg) {
+        // Shouldn't get here, as the only supported methods are
+        // defined in the ResourceCollection interface, and implemented
+        // by specific invoker subclasses
+        throw new UnsupportedOperationException(operation.getName());
+    }
+
+    /**
+     * Get operation invoker
+     * 
+     * @version $Rev$ $Date$
+     */
+    public static class GetInvoker extends AtomBindingInvoker {
+
+        public GetInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+            super(operation, uri, httpClient, authorizationHeader);
+        }
+
+        @Override
+        public Message invoke(Message msg) {
+
+            // Get an entry
+            String id = (String)((Object[])msg.getBody())[0];
+
+            // Send an HTTP GET
+            GetMethod getMethod = new GetMethod(uri + "/" + id);
+            getMethod.setRequestHeader("Authorization", authorizationHeader);
+            try {
+                httpClient.executeMethod(getMethod);
+                int status = getMethod.getStatusCode();
+
+                // Read the Atom entry
+                if (status == 200) {
+                    Entry entry =
+                        AtomEntryUtil.readEntry("atom_1.0", new InputStreamReader(getMethod.getResponseBodyAsStream()));
+                    msg.setBody(entry);
+
+                } else if (status == 404) {
+                    msg.setFaultBody(new NotFoundException());
+                } else {
+                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
+                }
+
+            } catch (Exception e) {
+                msg.setFaultBody(new ServiceRuntimeException(e));
+            } finally {
+                getMethod.releaseConnection();
+            }
+
+            return msg;
+        }
+    }
+
+    /**
+     * Post operation invoker
+     * 
+     * @version $Rev$ $Date$
+     */
+    public static class PostInvoker extends AtomBindingInvoker {
+
+        public PostInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+            super(operation, uri, httpClient, authorizationHeader);
+        }
+
+        @Override
+        public Message invoke(Message msg) {
+
+            // Post an entry
+            Entry entry = (Entry)((Object[])msg.getBody())[0];
+
+            // Send an HTTP POST
+            PostMethod postMethod = new PostMethod(uri);
+            postMethod.setRequestHeader("Authorization", authorizationHeader);
+            try {
+
+                // Write the Atom entry
+                StringWriter writer = new StringWriter();
+                AtomEntryUtil.writeEntry(entry, "atom_1.0", writer);
+                postMethod.setRequestHeader("Content-type", "application/atom+xml; charset=utf-8");
+                postMethod.setRequestEntity(new StringRequestEntity(writer.toString()));
+
+                httpClient.executeMethod(postMethod);
+                int status = postMethod.getStatusCode();
+
+                // Read the Atom entry
+                if (status == 200 || status == 201) {
+                    Entry createdEntry =
+                        AtomEntryUtil
+                            .readEntry("atom_1.0", new InputStreamReader(postMethod.getResponseBodyAsStream()));
+                    msg.setBody(createdEntry);
+
+                } else if (status == 404) {
+                    msg.setFaultBody(new NotFoundException());
+                } else {
+                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
+                }
+
+            } catch (Exception e) {
+                msg.setFaultBody(new ServiceRuntimeException(e));
+            } finally {
+                postMethod.releaseConnection();
+            }
+
+            return msg;
+        }
+    }
+
+    /**
+     * Put operation invoker
+     * 
+     * @version $Rev$ $Date$
+     */
+    public static class PutInvoker extends AtomBindingInvoker {
+
+        public PutInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+            super(operation, uri, httpClient, authorizationHeader);
+        }
+
+        @Override
+        public Message invoke(Message msg) {
+
+            // Put an entry
+            Object[] args = (Object[])msg.getBody();
+            String id = (String)args[0];
+            Entry entry = (Entry)args[1];
+
+            // Send an HTTP PUT
+            PutMethod putMethod = new PutMethod(uri + "/" + id);
+            putMethod.setRequestHeader("Authorization", authorizationHeader);
+            try {
+
+                // Write the Atom entry
+                StringWriter writer = new StringWriter();
+                AtomEntryUtil.writeEntry(entry, "atom_1.0", writer);
+                putMethod.setRequestHeader("Content-type", "application/atom+xml; charset=utf-8");
+                putMethod.setRequestEntity(new StringRequestEntity(writer.toString()));
+
+                httpClient.executeMethod(putMethod);
+                int status = putMethod.getStatusCode();
+
+                // Read the Atom entry
+                if (status == 200 || status == 201) {
+                    try {
+                        Entry updatedEntry =
+                            AtomEntryUtil.readEntry("atom_1.0", new InputStreamReader(putMethod
+                                .getResponseBodyAsStream()));
+                        msg.setBody(updatedEntry);
+                    } catch (Exception e) {
+                        // Returning the updated entry is optional
+                    }
+
+                } else if (status == 404) {
+                    msg.setFaultBody(new NotFoundException());
+                } else {
+                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
+                }
+
+            } catch (Exception e) {
+                msg.setFaultBody(new ServiceRuntimeException(e));
+            } finally {
+                putMethod.releaseConnection();
+            }
+
+            return msg;
+        }
+    }
+
+    /**
+     * Delete operation invoker
+     * 
+     * @version $Rev$ $Date$
+     */
+    public static class DeleteInvoker extends AtomBindingInvoker {
+
+        public DeleteInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+            super(operation, uri, httpClient, authorizationHeader);
+        }
+
+        @Override
+        public Message invoke(Message msg) {
+
+            // Delete an entry
+            String id = (String)((Object[])msg.getBody())[0];
+
+            // Send an HTTP DELETE
+            DeleteMethod deleteMethod = new DeleteMethod(uri + "/" + id);
+            deleteMethod.setRequestHeader("Authorization", authorizationHeader);
+            try {
+                httpClient.executeMethod(deleteMethod);
+                int status = deleteMethod.getStatusCode();
+
+                // Read the Atom entry
+                if (status == 200) {
+                    msg.setBody(null);
+
+                } else if (status == 404) {
+                    msg.setFaultBody(new NotFoundException());
+                } else {
+                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
+                }
+
+            } catch (Exception e) {
+                msg.setFaultBody(new ServiceRuntimeException(e));
+            } finally {
+                deleteMethod.releaseConnection();
+            }
+
+            return msg;
+        }
+    }
+
+    /**
+     * GetCollection operation invoker
+     * 
+     * @version $Rev$ $Date$
+     */
+    public static class GetCollectionInvoker extends AtomBindingInvoker {
+
+        public GetCollectionInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+            super(operation, uri, httpClient, authorizationHeader);
+        }
+
+        @Override
+        public Message invoke(Message msg) {
+
+            // Get a feed
+
+            // Send an HTTP GET
+            GetMethod getMethod = new GetMethod(uri);
+            getMethod.setRequestHeader("Authorization", authorizationHeader);
+            try {
+                httpClient.executeMethod(getMethod);
+                int status = getMethod.getStatusCode();
+
+                // Read the Atom feed
+                if (status == 200) {
+                    WireFeedInput input = new WireFeedInput();
+                    Feed feed = (Feed)input.build(new XmlReader(getMethod.getResponseBodyAsStream()));
+                    msg.setBody(feed);
+
+                } else if (status == 404) {
+                    msg.setFaultBody(new NotFoundException());
+                } else {
+                    msg.setFaultBody(new ServiceRuntimeException("HTTP status code: " + status));
+                }
+
+            } catch (Exception e) {
+                msg.setFaultBody(new ServiceRuntimeException(e));
+            } finally {
+                getMethod.releaseConnection();
+            }
+
+            return msg;
+        }
+    }
+
+    /**
+     * PostMedia operation invoker
+     * 
+     * @version $Rev$ $Date$
+     */
+    public static class PostMediaInvoker extends AtomBindingInvoker {
+
+        public PostMediaInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+            super(operation, uri, httpClient, authorizationHeader);
+        }
+
+        @Override
+        public Message invoke(Message msg) {
+            // TODO implement
+            return super.invoke(msg);
+        }
+    }
+
+    /**
+     * PutMedia operation invoker
+     * 
+     * @version $Rev$ $Date$
+     */
+    public static class PutMediaInvoker extends AtomBindingInvoker {
+
+        public PutMediaInvoker(Operation operation, String uri, HttpClient httpClient, String authorizationHeader) {
+            super(operation, uri, httpClient, authorizationHeader);
+        }
+
+        @Override
+        public Message invoke(Message msg) {
+            // TODO implement
+            return super.invoke(msg);
+        }
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
new file mode 100644
index 0000000000..0f2356b5e0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import org.apache.tuscany.sca.binding.feed.AtomBinding;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.BindingProviderFactory;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+/**
+ * Implementation of the Atom binding model.
+ */
+public class AtomBindingProviderFactory implements BindingProviderFactory<AtomBinding> {
+
+    private MessageFactory messageFactory;
+    private ServletHost servletHost;
+
+    public AtomBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
+        this.servletHost = servletHosts.getServletHosts().get(0);
+        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        this.messageFactory = modelFactories.getFactory(MessageFactory.class);
+    }
+
+    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
+                                                                   RuntimeComponentReference reference,
+                                                                   AtomBinding binding) {
+        return new AtomReferenceBindingProvider(component, reference, binding);
+    }
+
+    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
+                                                               RuntimeComponentService service,
+                                                               AtomBinding binding) {
+        return new AtomServiceBindingProvider(component, service, binding, servletHost, messageFactory);
+    }
+
+    public Class<AtomBinding> getModelType() {
+        return AtomBinding.class;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomEntryUtil.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomEntryUtil.java
new file mode 100644
index 0000000000..f2566f81a5
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomEntryUtil.java
@@ -0,0 +1,104 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletException;
+
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+import org.jdom.output.Format;
+import org.jdom.output.XMLOutputter;
+
+import com.sun.syndication.feed.atom.Entry;
+import com.sun.syndication.feed.atom.Feed;
+import com.sun.syndication.io.FeedException;
+import com.sun.syndication.io.WireFeedInput;
+import com.sun.syndication.io.WireFeedOutput;
+
+/**
+ * Utility methods to read/write Atom entries.
+ *
+ * @version $Rev$ $Date$
+ */
+class AtomEntryUtil {
+
+    /**
+     * Read an Atom entry
+     * 
+     * @param request
+     * @return
+     * @throws IOException
+     * @throws JDOMException
+     * @throws FeedException
+     * @throws IllegalArgumentException
+     */
+    static Entry readEntry(String feedType, Reader reader) throws JDOMException, IOException, IllegalArgumentException,
+        FeedException {
+        SAXBuilder builder = new SAXBuilder();
+        Document document = builder.build(reader);
+        Element root = document.getRootElement();
+        root.detach();
+        Feed feed = new Feed();
+        feed.setFeedType(feedType);
+        WireFeedOutput wireFeedOutput = new WireFeedOutput();
+        document = wireFeedOutput.outputJDom(feed);
+        document.getRootElement().addContent(root);
+        WireFeedInput input = new WireFeedInput();
+        feed = (Feed)input.build(document);
+        Entry entry = (Entry)feed.getEntries().get(0);
+        return entry;
+    }
+
+    /**
+     * Write an Atom entry.
+     * 
+     * @param entry
+     * @param response
+     * @throws FeedException
+     * @throws IllegalArgumentException
+     * @throws IOException
+     * @throws ServletException
+     */
+    static void writeEntry(Entry entry, String feedType, Writer writer) throws IllegalArgumentException, FeedException,
+        IOException {
+        Feed feed = new Feed();
+        feed.setFeedType(feedType);
+        List<Entry> entries = new ArrayList<Entry>();
+        entries.add(entry);
+        feed.setEntries(entries);
+
+        WireFeedOutput wireFeedOutput = new WireFeedOutput();
+        Document document = wireFeedOutput.outputJDom(feed);
+        Element root = document.getRootElement();
+        Element element = (Element)root.getChildren().get(0);
+        XMLOutputter outputter = new XMLOutputter();
+        outputter.setFormat(Format.getPrettyFormat());
+        outputter.output(element, writer);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
new file mode 100644
index 0000000000..9b7537d04c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
@@ -0,0 +1,110 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import java.net.URI;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
+import org.apache.tuscany.sca.binding.feed.AtomBinding;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+
+/**
+ * Implementation of the Atom binding provider.
+ */
+class AtomReferenceBindingProvider implements ReferenceBindingProvider {
+
+    private RuntimeComponentReference reference;
+    private AtomBinding binding;
+    private String authorizationHeader;
+    private HttpClient httpClient;
+
+    AtomReferenceBindingProvider(RuntimeComponent component,
+                                        RuntimeComponentReference reference,
+                                        AtomBinding binding) {
+        this.reference = reference;
+        this.binding = binding;
+
+        // Prepare authorization header
+        String authorization = "admin" + ":" + "admin";
+        authorizationHeader = "Basic " + new String(Base64.encodeBase64(authorization.getBytes()));
+        ;
+
+        // Create an HTTP client
+        httpClient = new HttpClient(new MultiThreadedHttpConnectionManager());
+        httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(60000);
+    }
+
+    public Invoker createInvoker(Operation operation) {
+        String operationName = operation.getName();
+        if (operationName.equals("get")) {
+            return new AtomBindingInvoker.GetInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+        } else if (operationName.equals("post")) {
+            return new AtomBindingInvoker.PostInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+        } else if (operationName.equals("put")) {
+            return new AtomBindingInvoker.PutInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+        } else if (operationName.equals("delete")) {
+            return new AtomBindingInvoker.DeleteInvoker(operation, binding.getURI(), httpClient,
+                                                        authorizationHeader);
+        } else if (operationName.equals("getFeed")) {
+            return new AtomBindingInvoker.GetCollectionInvoker(operation, binding.getURI(), httpClient,
+                                                               authorizationHeader);
+        } else if (operationName.equals("postMedia")) {
+            return new AtomBindingInvoker.PostMediaInvoker(operation, binding.getURI(), httpClient,
+                                                           authorizationHeader);
+        } else if (operationName.equals("putMedia")) {
+            return new AtomBindingInvoker.PutMediaInvoker(operation, binding.getURI(), httpClient,
+                                                          authorizationHeader);
+        }
+
+        return new AtomBindingInvoker(operation, binding.getURI(), httpClient, authorizationHeader);
+    }
+
+    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);
+    }
+
+    public void stop() {
+        httpClient = null;
+    }
+    
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
new file mode 100644
index 0000000000..ff3d3a8c55
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
@@ -0,0 +1,82 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import org.apache.tuscany.sca.binding.feed.AtomBinding;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+
+/**
+ * Implementation of the Atom binding provider.
+ */
+class AtomServiceBindingProvider implements ServiceBindingProvider {
+
+    private RuntimeComponentService service;
+    private AtomBinding binding;
+    private ServletHost servletHost;
+    private MessageFactory messageFactory;
+    private String uri;
+
+    AtomServiceBindingProvider(RuntimeComponent component,
+                                      RuntimeComponentService service,
+                                      AtomBinding binding,
+                                      ServletHost servletHost,
+                                      MessageFactory messageFactory) {
+        this.service = service;
+        this.binding = binding;
+        this.servletHost = servletHost;
+        this.messageFactory = messageFactory;
+        uri = binding.getURI();
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return service.getInterfaceContract();
+    }
+    
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+    public void start() {
+        RuntimeComponentService componentService = (RuntimeComponentService)service;
+        RuntimeWire wire = componentService.getRuntimeWire(binding);
+
+        FeedBindingListenerServlet servlet =
+            new FeedBindingListenerServlet(wire, messageFactory, "atom_1.0");
+
+        String mapping = uri;
+        if (!mapping.endsWith("/")) {
+            mapping += "/";
+        }
+        if (!mapping.endsWith("*")) {
+            mapping += "*";
+        }
+        servletHost.addServletMapping(mapping, servlet);
+    }
+
+    public void stop() {
+        servletHost.removeServletMapping(uri);
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
new file mode 100644
index 0000000000..ce48a913e9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
@@ -0,0 +1,535 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.StringTokenizer;
+import java.util.logging.Logger;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.tuscany.sca.binding.feed.collection.NotFoundException;
+import org.apache.tuscany.sca.invocation.InvocationChain;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.Namespace;
+import org.jdom.output.Format;
+import org.jdom.output.XMLOutputter;
+
+import com.sun.syndication.feed.atom.Entry;
+import com.sun.syndication.feed.atom.Feed;
+import com.sun.syndication.feed.atom.Link;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.feed.synd.SyndFeedImpl;
+import com.sun.syndication.io.FeedException;
+import com.sun.syndication.io.SyndFeedOutput;
+import com.sun.syndication.io.WireFeedOutput;
+
+/**
+ * A resource collection binding listener, implemented as a servlet and
+ * registered in a servlet host provided by the SCA hosting runtime.
+ */
+class FeedBindingListenerServlet extends HttpServlet {
+    private static final Logger logger = Logger.getLogger(FeedBindingListenerServlet.class.getName());
+    private static final long serialVersionUID = 1L;
+
+    private final static Namespace APP_NS = Namespace.getNamespace("app", "http://purl.org/atom/app#");
+    private final static Namespace ATOM_NS = Namespace.getNamespace("atom", "http://www.w3.org/2005/Atom");
+
+    private RuntimeWire wire;
+    private Invoker getFeedInvoker;
+    private Invoker getInvoker;
+    private Invoker postInvoker;
+    private Invoker postMediaInvoker;
+    private Invoker putInvoker;
+    private Invoker putMediaInvoker;
+    private Invoker deleteInvoker;
+    private MessageFactory messageFactory;
+    private String feedType;
+
+    /**
+     * Constructs a new binding listener.
+     * 
+     * @param wire
+     * @param messageFactory
+     * @param feedType
+     */
+    FeedBindingListenerServlet(RuntimeWire wire, MessageFactory messageFactory, String feedType) {
+        this.wire = wire;
+        this.messageFactory = messageFactory;
+        this.feedType = feedType;
+
+        // Get the invokers for the supported operations
+        for (InvocationChain invocationChain : this.wire.getInvocationChains()) {
+            String operationName = invocationChain.getSourceOperation().getName();
+            if (operationName.equals("getFeed")) {
+                getFeedInvoker = invocationChain.getHeadInvoker();
+            } else if (operationName.equals("get")) {
+                getInvoker = invocationChain.getHeadInvoker();
+            } else if (operationName.equals("put")) {
+                putInvoker = invocationChain.getHeadInvoker();
+            } else if (operationName.equals("putMedia")) {
+                putMediaInvoker = invocationChain.getHeadInvoker();
+            } else if (operationName.equals("post")) {
+                postInvoker = invocationChain.getHeadInvoker();
+            } else if (operationName.equals("postMedia")) {
+                postMediaInvoker = invocationChain.getHeadInvoker();
+            } else if (operationName.equals("delete")) {
+                deleteInvoker = invocationChain.getHeadInvoker();
+            }
+        }
+    }
+
+    @Override
+    public void init(ServletConfig config) {
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        // No authentication required for a get request
+
+        // Get the request path
+        String path = request.getPathInfo();
+
+        // The feedType parameter is used to override what type of feed is going
+        // to
+        // be produced
+        String requestFeedType = request.getParameter("feedType");
+        if (requestFeedType == null)
+            requestFeedType = feedType;
+
+        logger.info(">>> FeedEndPointServlet (" + requestFeedType + ") " + request.getRequestURI());
+
+        // Handle an Atom request
+        if (requestFeedType.startsWith("atom_")) {
+
+            if (path != null && path.equals("/atomsvc")) {
+
+                // Return the Atom service document
+                response.setContentType("application/atomsvc+xml; charset=utf-8");
+                Document document = new Document();
+                Element service = new Element("service", APP_NS);
+                document.setRootElement(service);
+
+                Element workspace = new Element("workspace", APP_NS);
+                Element title = new Element("title", ATOM_NS);
+                title.setText("resource");
+                workspace.addContent(title);
+                service.addContent(workspace);
+
+                Element collection = new Element("collection", APP_NS);
+                String href = request.getRequestURL().toString();
+                href = href.substring(0, href.length() - "/atomsvc".length());
+                collection.setAttribute("href", href);
+                Element collectionTitle = new Element("title", ATOM_NS);
+                collectionTitle.setText("entries");
+                collection.addContent(collectionTitle);
+                workspace.addContent(collection);
+
+                XMLOutputter outputter = new XMLOutputter();
+                Format format = Format.getPrettyFormat();
+                format.setEncoding("UTF-8");
+                outputter.setFormat(format);
+                outputter.output(document, getWriter(response));
+
+            } else if (path == null || path.length() == 0 || path.equals("/")) {
+
+                // Return a feed containing the entries in the collection
+
+                // Get the Feed from the service implementation
+                Message requestMessage = messageFactory.createMessage();
+                Message responseMessage = getFeedInvoker.invoke(requestMessage);
+                if (responseMessage.isFault()) {
+                    throw new ServletException((Throwable)responseMessage.getBody());
+                }
+                Feed feed = (Feed)responseMessage.getBody();
+                if (feed != null) {
+
+                    // Write the Atom feed
+                    response.setContentType("application/atom+xml; charset=utf-8");
+                    feed.setFeedType(requestFeedType);
+                    WireFeedOutput feedOutput = new WireFeedOutput();
+                    try {
+                        feedOutput.output(feed, getWriter(response));
+                    } catch (FeedException e) {
+                        throw new ServletException(e);
+                    }
+                } else {
+                    response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                }
+            } else if (path.startsWith("/")) {
+
+                // Return a specific entry in the collection
+
+                // Get the entry from the service implementation
+                Message requestMessage = messageFactory.createMessage();
+                String id = path.substring(1);
+                requestMessage.setBody(new Object[] {id});
+                Message responseMessage = getInvoker.invoke(requestMessage);
+                if (responseMessage.isFault()) {
+                    throw new ServletException((Throwable)responseMessage.getBody());
+                }
+                Entry entry = responseMessage.getBody();
+
+                // Write the Atom entry
+                if (entry != null) {
+                    response.setContentType("application/atom+xml; charset=utf-8");
+                    try {
+                        AtomEntryUtil.writeEntry(entry, feedType, getWriter(response));
+                    } catch (FeedException e) {
+                        throw new ServletException(e);
+                    }
+                } else {
+                    response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                }
+
+            } else {
+
+                // Path doesn't match any known pattern
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            }
+        } else {
+
+            // Handle an RSS request
+
+            if (path == null || path.length() == 0 || path.equals("/")) {
+
+                // Get the Feed from the service
+                Message requestMessage = messageFactory.createMessage();
+                Message responseMessage = getFeedInvoker.invoke(requestMessage);
+                if (responseMessage.isFault()) {
+                    throw new ServletException((Throwable)responseMessage.getBody());
+                }
+                Feed feed = (Feed)responseMessage.getBody();
+                if (feed != null) {
+
+                    // Convert to an RSS feed
+                    response.setContentType("application/rss+xml; charset=utf-8");
+                    feed.setFeedType("atom_1.0");
+                    SyndFeed syndFeed = new SyndFeedImpl(feed);
+                    syndFeed.setFeedType(requestFeedType);
+                    SyndFeedOutput syndOutput = new SyndFeedOutput();
+                    try {
+                        syndOutput.output(syndFeed, getWriter(response));
+                    } catch (FeedException e) {
+                        throw new ServletException(e);
+                    }
+                } else {
+                    response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                }
+            } else {
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            }
+        }
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+        IOException {
+
+        // Authenticate the user
+        String user = processAuthorizationHeader(request);
+        if (user == null) {
+            unauthorized(response);
+            return;
+        }
+
+        // Get the request path
+        String path = request.getPathInfo();
+
+        if (path == null || path.length() == 0 || path.equals("/")) {
+            Entry createdEntry = null;
+
+            // Create a new Atom entry
+            String contentType = request.getContentType();
+            if (contentType.startsWith("application/atom+xml")) {
+
+                // Read the entry from the request
+                Entry entry;
+                try {
+                    entry = AtomEntryUtil.readEntry(feedType, request.getReader());
+                } catch (JDOMException e) {
+                    throw new ServletException(e);
+                } catch (FeedException e) {
+                    throw new ServletException(e);
+                }
+
+                // Let the component implementation create it
+                Message requestMessage = messageFactory.createMessage();
+                requestMessage.setBody(new Object[] {entry});
+                Message responseMessage = postInvoker.invoke(requestMessage);
+                if (responseMessage.isFault()) {
+                    throw new ServletException((Throwable)responseMessage.getBody());
+                }
+                createdEntry = responseMessage.getBody();
+
+            } else if (contentType != null) {
+
+                // Create a new media entry
+
+                // Get incoming headers
+                String title = request.getHeader("Title");
+                String slug = request.getHeader("Slug");
+
+                // Let the component implementation create the media entry
+                Message requestMessage = messageFactory.createMessage();
+                requestMessage.setBody(new Object[] {title, slug, contentType, request.getInputStream()});
+                Message responseMessage = postMediaInvoker.invoke(requestMessage);
+                if (responseMessage.isFault()) {
+                    throw new ServletException((Throwable)responseMessage.getBody());
+                }
+                createdEntry = responseMessage.getBody();
+            } else {
+                response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
+            }
+
+            // A new entry was created successfully
+            if (createdEntry != null) {
+
+                // Set location of the created entry in the Location header
+                for (Object l : createdEntry.getOtherLinks()) {
+                    Link link = (Link)l;
+                    if (link.getRel() == null || "edit".equals(link.getRel())) {
+                        response.addHeader("Location", link.getHref());
+                        break;
+                    }
+                }
+
+                // Write the created Atom entry
+                response.setStatus(HttpServletResponse.SC_CREATED);
+                response.setContentType("application/atom+xml; charset=utf-8");
+                try {
+                    AtomEntryUtil.writeEntry(createdEntry, feedType, getWriter(response));
+                } catch (FeedException e) {
+                    throw new ServletException(e);
+                }
+
+            } else {
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            }
+
+        } else {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+    private Writer getWriter(HttpServletResponse response) throws UnsupportedEncodingException, IOException {
+        Writer writer = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
+        return writer;
+    }
+
+    @Override
+    protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        // Authenticate the user
+        String user = processAuthorizationHeader(request);
+        if (user == null) {
+            unauthorized(response);
+            return;
+        }
+
+        // Get the request path
+        String path = request.getPathInfo();
+
+        if (path != null && path.startsWith("/")) {
+            String id = path.substring(1);
+            Entry updatedEntry = null;
+
+            // Update an Atom entry
+            String contentType = request.getContentType();
+            if (contentType.startsWith("application/atom+xml")) {
+
+                // Read the entry from the request
+                Entry entry;
+                try {
+                    entry = AtomEntryUtil.readEntry(feedType, request.getReader());
+                } catch (JDOMException e) {
+                    throw new ServletException(e);
+                } catch (FeedException e) {
+                    throw new ServletException(e);
+                }
+
+                // Let the component implementation create it
+                Message requestMessage = messageFactory.createMessage();
+                requestMessage.setBody(new Object[] {id, entry});
+                Message responseMessage = putInvoker.invoke(requestMessage);
+                if (responseMessage.isFault()) {
+                    Object body = responseMessage.getBody();
+                    if (body instanceof NotFoundException) {
+                        response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                    } else {
+                        throw new ServletException((Throwable)responseMessage.getBody());
+                    }
+                } else {
+                    updatedEntry = responseMessage.getBody();
+                }
+
+            } else if (contentType != null) {
+
+                // Updated a media entry
+
+                // Let the component implementation create the media entry
+                Message requestMessage = messageFactory.createMessage();
+                requestMessage.setBody(new Object[] {id, contentType, request.getInputStream()});
+                Message responseMessage = putMediaInvoker.invoke(requestMessage);
+                Object body = responseMessage.getBody();
+                if (body instanceof NotFoundException) {
+                    if (body instanceof NotFoundException) {
+                        response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                    } else {
+                        throw new ServletException((Throwable)responseMessage.getBody());
+                    }
+                } else {
+                    updatedEntry = (Entry) body;
+                }
+
+            } else {
+                response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
+            }
+
+            // The entry was successfully updated
+            if (updatedEntry != null) {
+
+                // Write the updated Atom entry
+                response.setContentType("application/atom+xml; charset=utf-8");
+                try {
+                    AtomEntryUtil.writeEntry(updatedEntry, feedType, getWriter(response));
+                } catch (FeedException e) {
+                    throw new ServletException(e);
+                }
+
+            } else {
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            }
+
+        } else {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+    @Override
+    protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+        IOException {
+
+        // Authenticate the user
+        String user = processAuthorizationHeader(request);
+        if (user == null) {
+            unauthorized(response);
+            return;
+        }
+
+        // Get the request path
+        String path = request.getPathInfo();
+
+        String id;
+        if (path != null && path.startsWith("/")) {
+            id = path.substring(1);
+        } else {
+            id = "";
+        }
+
+        // Delete a specific entry from the collection
+        Message requestMessage = messageFactory.createMessage();
+        requestMessage.setBody(new Object[] {id});
+        Message responseMessage = deleteInvoker.invoke(requestMessage);
+        if (responseMessage.isFault()) {
+            Object body = responseMessage.getBody();
+            if (body instanceof NotFoundException) {
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            } else {
+                throw new ServletException((Throwable)responseMessage.getBody());
+            }
+        }
+    }
+
+    /**
+     * Process the authorization header
+     * 
+     * @param request
+     * @return
+     * @throws ServletException
+     */
+    private String processAuthorizationHeader(HttpServletRequest request) throws ServletException {
+        try {
+            String authorization = request.getHeader("Authorization");
+            if (authorization != null) {
+                StringTokenizer tokens = new StringTokenizer(authorization);
+                if (tokens.hasMoreTokens()) {
+                    String basic = tokens.nextToken();
+                    if (basic.equalsIgnoreCase("Basic")) {
+                        String credentials = tokens.nextToken();
+                        String userAndPassword = new String(Base64.decodeBase64(credentials.getBytes()));
+                        int colon = userAndPassword.indexOf(":");
+                        if (colon != -1) {
+                            String user = userAndPassword.substring(0, colon);
+                            String password = userAndPassword.substring(colon + 1);
+
+                            // Authenticate the User.
+                            if (authenticate(user, password)) {
+                                return user;
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new ServletException(e);
+        }
+        return null;
+    }
+
+    /**
+     * Authenticate a user.
+     * 
+     * @param user
+     * @param password
+     * @return
+     */
+    private boolean authenticate(String user, String password) {
+
+        // TODO Handle this using SCA security policies
+        //FIXME Why are we using endsWith instead of equals here??
+        return ("admin".endsWith(user) && "admin".equals(password));
+    }
+
+    /**
+     * Reject an unauthorized request.
+     * 
+     * @param response
+     */
+    private void unauthorized(HttpServletResponse response) throws IOException {
+        response.setHeader("WWW-Authenticate", "BASIC realm=\"Tuscany\"");
+        response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
new file mode 100644
index 0000000000..4b3dbc7de3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
@@ -0,0 +1,82 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
+
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+
+import com.sun.syndication.feed.atom.Feed;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.io.FeedException;
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.WireFeedInput;
+import com.sun.syndication.io.XmlReader;
+
+/**
+ * Invoker for the RSS binding.
+ */
+class RSSBindingInvoker implements Invoker {
+    private final static Logger logger = Logger.getLogger(RSSBindingInvoker.class.getName());
+    
+    private String feedType;
+    private String uri;
+
+    RSSBindingInvoker(String uri, String feedType) {
+        this.uri = uri;
+        this.feedType = feedType;
+    }
+
+    public Message invoke(Message msg) {
+        try {
+            logger.info(">>> RSSBindingInvoker (" + feedType + ") " + uri);
+
+            // Read the configured feed URI into a Feed object
+            Feed feed;
+            if (feedType.startsWith("atom_")) {
+
+                // Read an Atom feed
+                WireFeedInput input = new WireFeedInput();
+                feed = (Feed)input.build(new XmlReader(new URL(uri)));
+            } else {
+
+                // Read an RSS feed and convert it to an Atom feed
+                SyndFeedInput input = new SyndFeedInput();
+                SyndFeed syndFeed = input.build(new XmlReader(new URL(uri)));
+                feed = (Feed)syndFeed.createWireFeed("atom_1.0");
+            }
+            msg.setBody(feed);
+
+        } catch (MalformedURLException e) {
+            msg.setFaultBody(e);
+        } catch (IllegalArgumentException e) {
+            msg.setFaultBody(e);
+        } catch (FeedException e) {
+            msg.setFaultBody(e);
+        } catch (IOException e) {
+            msg.setFaultBody(e);
+        }
+        return msg;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
new file mode 100644
index 0000000000..98c53d6bed
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import org.apache.tuscany.sca.binding.feed.RSSBinding;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.BindingProviderFactory;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+/**
+ * Implementation of the RSS binding provider factory.
+ */
+public class RSSBindingProviderFactory implements BindingProviderFactory<RSSBinding> {
+
+    MessageFactory messageFactory;
+    ServletHost servletHost;
+
+    public RSSBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
+        this.servletHost = servletHosts.getServletHosts().get(0);
+        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        this.messageFactory = modelFactories.getFactory(MessageFactory.class);
+    }
+
+    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
+                                                                   RuntimeComponentReference reference,
+                                                                   RSSBinding binding) {
+        return new RSSReferenceBindingProvider(component, reference, binding);
+    }
+
+    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
+                                                               RuntimeComponentService service,
+                                                               RSSBinding binding) {
+        return new RSSServiceBindingProvider(component, service, binding, servletHost, messageFactory);
+    }
+
+    public Class<RSSBinding> getModelType() {
+        return RSSBinding.class;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
new file mode 100644
index 0000000000..6ef305f2fb
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
@@ -0,0 +1,63 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import org.apache.tuscany.sca.binding.feed.RSSBinding;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+
+/**
+ * Implementation of the RSS binding provider.
+ */
+class RSSReferenceBindingProvider implements ReferenceBindingProvider {
+
+    private RuntimeComponentReference reference;
+    private RSSBinding binding;
+
+    RSSReferenceBindingProvider(RuntimeComponent component,
+                                       RuntimeComponentReference reference,
+                                       RSSBinding binding) {
+        this.reference = reference;
+        this.binding = binding;
+    }
+
+    public Invoker createInvoker(Operation operation) {
+        return new RSSBindingInvoker(binding.getURI(), "rss_2.0");
+    }
+
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return reference.getInterfaceContract();
+    }
+    
+    public void start() {
+    }
+
+    public void stop() {
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
new file mode 100644
index 0000000000..c48426da0b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.0/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
@@ -0,0 +1,76 @@
+/*
+ * 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
+ * 
+ *   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.    
+ */
+
+package org.apache.tuscany.sca.binding.feed.provider;
+
+import org.apache.tuscany.sca.binding.feed.RSSBinding;
+import org.apache.tuscany.sca.host.http.ServletHost;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+
+/**
+ * Implementation of the RSS binding provider.
+ */
+class RSSServiceBindingProvider implements ServiceBindingProvider {
+
+    private RuntimeComponentService service;
+    private RSSBinding binding;
+    private ServletHost servletHost;
+    private MessageFactory messageFactory;
+    private String uri;
+
+    RSSServiceBindingProvider(RuntimeComponent component,
+                                     RuntimeComponentService service,
+                                     RSSBinding binding,
+                                     ServletHost servletHost,
+                                     MessageFactory messageFactory) {
+        this.service = service;
+        this.binding = binding;
+        this.servletHost = servletHost;
+        this.messageFactory = messageFactory;
+        uri = binding.getURI();
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return service.getInterfaceContract();
+    }
+    
+    public boolean supportsOneWayInvocation() {
+        return false;
+    }
+
+    public void start() {
+        RuntimeComponentService componentService = (RuntimeComponentService)service;
+        RuntimeWire wire = componentService.getRuntimeWire(binding);
+
+        FeedBindingListenerServlet servlet =
+            new FeedBindingListenerServlet(wire, messageFactory, "rss_2.0");
+
+        servletHost.addServletMapping(uri, servlet);
+    }
+
+    public void stop() {
+        servletHost.removeServletMapping(uri);
+    }
+
+}