Branch for 1.4

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

7 files changed, 432 insertions, 0 deletions

diff --git a/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
new file mode 100644
index 0000000000..d4adf03851
--- /dev/null
+++ b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
@@ -0,0 +1,178 @@
+/*
+ * 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 feed;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.abdera.Abdera;
+import org.apache.abdera.factory.Factory;
+import org.apache.abdera.model.Document;
+import org.apache.abdera.model.Entry;
+import org.apache.abdera.model.Feed;
+import org.apache.abdera.model.Person;
+import org.apache.abdera.parser.Parser;
+import org.apache.tuscany.sca.binding.atom.collection.Collection;
+import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.feed.synd.SyndFeedImpl;
+import com.sun.syndication.io.SyndFeedOutput;
+
+/**
+ * Implementation of an SCA component that aggregates several
+ * Atom and RSS feeds.
+ *
+ * @version $Rev$ $Date$
+ */
+public class AggregatorImpl implements org.apache.tuscany.sca.binding.atom.collection.Collection {
+
+    @Reference(required = false)
+    public Collection atomFeed1;
+    @Reference(required = false)
+    public Collection atomFeed2;
+    
+    @Reference(required = false)
+    public org.apache.tuscany.sca.binding.rss.collection.Collection rssFeed1;
+    @Reference(required = false)
+    public org.apache.tuscany.sca.binding.rss.collection.Collection rssFeed2;
+    
+    @Reference(required = false)
+    public Sort sort;
+
+    @Property
+    public String feedTitle = "Aggregated Feed";
+    @Property
+    public String feedDescription = "Anonymous Aggregated Feed";
+    @Property
+    public String feedAuthor = "anonymous";
+    
+    public Feed getFeed() {
+        
+        // Create a new Feed
+        Factory factory = Abdera.getNewFactory();
+        Feed feed = factory.newFeed();
+        feed.setTitle(feedTitle);
+        feed.setSubtitle(feedDescription);
+        Person author = factory.newAuthor();
+        author.setName(feedAuthor);
+        feed.addAuthor(author);
+        feed.addLink("http://tuscany.apache.org", "alternate");
+
+        // Aggregate entries from atomFeed1, atomFeed2, rssFeed1 and rssFeed2
+        List<Entry> entries = new ArrayList<Entry>();
+        if (atomFeed1 != null) {
+            try {
+                entries.addAll(atomFeed1.getFeed().getEntries());
+            } catch (Exception e) {}
+        }
+        if (atomFeed2 != null) {
+            try {
+                entries.addAll(atomFeed2.getFeed().getEntries());
+            } catch (Exception e) {}
+        }
+        if (rssFeed1 != null) {
+            try {
+                entries.addAll(atomFeed(rssFeed1.getFeed()).getEntries());
+            } catch (Exception e) {}
+        }
+        if (rssFeed2 != null) {
+            try {
+                entries.addAll(atomFeed(rssFeed2.getFeed()).getEntries());
+            } catch (Exception e) {}
+        }
+
+        // Sort entries by published date
+        if (sort != null) {
+            entries = sort.sort(entries);
+        }
+        
+        // Add the entries to the new feed
+        for (Entry entry: entries) {
+            feed.addEntry(entry);
+        }
+        
+        return feed;
+    }
+
+    public Feed query(String queryString) {
+        Factory factory = Abdera.getNewFactory();
+        Feed feed = factory.newFeed();
+        feed.setTitle(feedTitle);
+        feed.setSubtitle(feedDescription);
+        Person author = factory.newAuthor();
+        author.setName(feedAuthor);
+        feed.addAuthor(author);
+        feed.addLink("http://tuscany.apache.org", "alternate");
+        
+        Feed allFeed = getFeed();
+        if (queryString.startsWith("title=")) {
+            String title = queryString.substring(6);
+
+            for (Entry entry: allFeed.getEntries()) {
+                if (entry.getTitle().contains(title)) {
+                    feed.addEntry(entry);
+                }
+            }
+        }
+        return feed;
+    }
+
+    public void delete(String id) throws NotFoundException {
+    }
+
+    public Entry get(String id) throws NotFoundException {
+        return null;
+    }
+
+    public Entry post(Entry entry) {
+        return null;
+    }
+
+    public void put(String id, Entry entry) throws NotFoundException {
+    }
+
+    /**
+     * Convert a ROME feed to an Abdera feed.
+     * 
+     * @param romeFeed
+     * @return
+     */
+    private static Feed atomFeed(SyndFeed syndFeed) {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        
+        syndFeed.setFeedType("atom_1.0");
+        SyndFeedOutput syndOutput = new SyndFeedOutput();
+        try {
+            syndOutput.output(syndFeed, new OutputStreamWriter(bos));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        Parser parser = Abdera.getNewParser();
+        Document<Feed> document = parser.parse(new ByteArrayInputStream(bos.toByteArray()));
+        
+        return document.getRoot();
+    }
+}
diff --git a/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
new file mode 100644
index 0000000000..dec073c36b
--- /dev/null
+++ b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
@@ -0,0 +1,38 @@
+/*
+ * 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 feed;
+
+import java.util.List;
+
+import org.apache.abdera.model.Entry;
+
+/**
+ * The Sort service business interface.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Sort {
+
+    /**
+     * Sort feed entries by published date.
+     * @param entries
+     * @return
+     */
+    List<Entry> sort(List<Entry> entries);
+}
diff --git a/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
new file mode 100644
index 0000000000..f7ead126a7
--- /dev/null
+++ b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
@@ -0,0 +1,57 @@
+/*
+ * 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 feed;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.abdera.model.Entry;
+import org.osoa.sca.annotations.Property;
+
+/**
+ * Implementation of a Feed Sort service component.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class SortImpl implements Sort {
+
+    @Property
+    public boolean newFirst = true;
+
+    @SuppressWarnings("unchecked")
+    public List<Entry> sort(List<Entry> entries) {
+        Entry[] entriesArray = new Entry[entries.size()];
+        entriesArray = (Entry[])entries.toArray(entriesArray);
+        Arrays.sort(entriesArray, new Comparator() {
+            public int compare(final Object xObj, final Object yObj) {
+                Date xDate = ((Entry)xObj).getUpdated();
+                Date yDate = ((Entry)yObj).getUpdated();
+                if (xDate == null)
+                    return -1;
+                if (newFirst)
+                    return yDate.compareTo(xDate);
+                else
+                    return xDate.compareTo(yDate);
+            }
+        });
+        return Arrays.asList(entriesArray);
+    }
+}
diff --git a/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
new file mode 100644
index 0000000000..736563098f
--- /dev/null
+++ b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+	targetNamespace="http://aggregator"
+    name="FeedAggregator">
+
+	<service name="rssSample" promote="RssAggregator">
+		<tuscany:binding.atom uri="http://localhost:8083/rssAggregator"/>
+	</service>
+	<service name="atomSample" promote="AtomAggregator">
+		<tuscany:binding.atom  uri="http://localhost:8083/atomAggregator"/>
+	</service>	
+
+    <component name="RssAggregator">
+        <implementation.java class="feed.AggregatorImpl"/>             
+		<reference name="rssFeed1">
+   	 		<tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>
+   		</reference>
+   		<reference name="rssFeed2"> 	
+   	 		<tuscany:binding.rss uri="http://www.engadget.com/rss.xml"/>
+   		</reference>
+   		<reference name="sort" target="Sort"/> 	 		
+        <property name="feedTitle">RSS Aggregator Sample</property> 
+    </component>
+    <component name="Sort">
+        <implementation.java class="feed.SortImpl"/>       
+        <property name="newFirst">true</property> 
+    </component>    
+    
+    <component name="AtomAggregator">
+        <implementation.java class="feed.AggregatorImpl"/>        
+        <reference name="sort" target="Sort"/>          
+		<reference name="atomFeed1">
+   	 		<tuscany:binding.atom uri="http://www.oreillynet.com/pub/feed/35"/>
+   		</reference>
+   		<reference name="atomFeed2"> 	
+   	 		<tuscany:binding.atom uri="http://feeds.feedburner.com/blogspot/Dcni?format=xml"/>
+   		</reference>
+        <property name="feedTitle">Atom Aggregator Sample</property>    		           
+    </component>      
+
+</composite>
\ No newline at end of file
diff --git a/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b67fe843ca
--- /dev/null
+++ b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* 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.    
+-->
+
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://aggregator"
+              xmlns:a="http://aggregator">
+   <deployable composite="a:FeedAggregator"/>
+</contribution>
+
diff --git a/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..dea3980e4d
--- /dev/null
+++ b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.    
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+    <display-name>Apache Tuscany Feed Aggregator Sample</display-name>
+    
+    <filter>
+        <filter-name>tuscany</filter-name>
+        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
+    </filter>
+ 
+    <filter-mapping>
+        <filter-name>tuscany</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <welcome-file-list id="WelcomeFileList">
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>
diff --git a/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/index.html b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/index.html
new file mode 100644
index 0000000000..7b33391a87
--- /dev/null
+++ b/branches/sca-java-1.4/samples/feed-aggregator-webapp/src/main/webapp/index.html
@@ -0,0 +1,32 @@
+<html>
+<!--
+ * 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.    
+ -->
+  <head>
+    <title>Apache Tuscany Feed Aggregator Sample</title>
+  </head>
+  <body>
+
+    <h2>Apache Tuscany Feed Aggregator Sample</h2>
+    <p>To read the aggregated feeds, point your Web browser to the following addresses:</p>
+    <br/><a href="atomAggregator">http://localhost:8083/sample-feed-aggregator-webapp/atomAggregator</a>
+    <br/><a href="atomAggregator/atomsvc">http://localhost:8083/sample-feed-aggregator-webapp/atomAggregator/atomsvc (for the Atom service document)</a>
+    <br/><a href="rssAggregator">http://localhost:8083/sample-feed-aggregator-webapp/rssAggregator</a>
+     
+  </body>
+</html>