From 5559ef5edbf8d3616f7a4b497b2a459b0ee4082b Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:07:07 +0000
Subject: Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835122 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/feed/AggregatorImpl.java         | 100 ---------------------
 .../src/main/java/feed/SampleServer.java           |  54 -----------
 .../src/main/java/feed/Sort.java                   |  38 --------
 .../src/main/java/feed/SortImpl.java               |  58 ------------
 .../src/main/resources/FeedAggregator.composite    |  60 -------------
 .../src/main/webapp/META-INF/sca-contribution.xml  |  26 ------
 .../src/main/webapp/WEB-INF/web.xml                |  41 ---------
 .../src/main/webapp/index.html                     |  34 -------
 8 files changed, 411 deletions(-)
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/index.html

(limited to 'branches/sca-java-1.0/samples/feed-aggregator-webapp/src')

diff --git a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
deleted file mode 100644
index 6d15b5426b..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.feed.collection.NotFoundException;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-import com.sun.syndication.feed.atom.Content;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.feed.atom.Person;
-
-/**
- * Implementation of an SCA component that aggregates several
- * Atom and RSS feeds.
- *
- * @version $Rev$ $Date$
- */
-public class AggregatorImpl implements org.apache.tuscany.sca.binding.feed.collection.Collection {
-
-    @Reference
-    public org.apache.tuscany.sca.binding.feed.collection.Collection feed1;
-    @Reference
-    public org.apache.tuscany.sca.binding.feed.collection.Collection feed2;
-    @Reference(required = false)
-    public Sort sort;
-
-    @Property
-    public String feedTitle = "Aggregated Feed";
-    @Property
-    public String feedDescription = "Anonymous Aggregated Feed";
-    @Property
-    public String feedAuthor = "anonymous";
-
-    @SuppressWarnings("unchecked")
-    public com.sun.syndication.feed.atom.Feed getFeed() {
-        
-        // Create a new Feed
-        com.sun.syndication.feed.atom.Feed feed = new com.sun.syndication.feed.atom.Feed();
-        feed.setTitle(feedTitle);
-        Content subtitle = new Content();
-        subtitle.setValue(feedDescription);
-        feed.setSubtitle(subtitle);
-        Person author = new Person();
-        author.setName(feedAuthor);
-        feed.setAuthors(Collections.singletonList(author));
-        Link link = new Link();
-        link.setHref("http://incubator.apache.org/tuscany");
-        feed.getAlternateLinks().add(link);
-
-        // Aggregate entries from feed1 and feed2
-        List<Entry> entries = new ArrayList<Entry>();
-        entries.addAll(feed1.getFeed().getEntries());
-        entries.addAll(feed2.getFeed().getEntries());
-
-        // Sort entries by published date
-        if (sort != null)
-            feed.setEntries(sort.sort(entries));
-        else
-            feed.setEntries(entries);
-        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 Entry put(String id, Entry entry) throws NotFoundException {
-        return null;
-    }
-
-}
diff --git a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
deleted file mode 100644
index 05961a315c..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class SampleServer {
-    public static void main(String[] args) throws Exception {
-
-        SCADomain scaDomain = SCADomain.newInstance("FeedAggregator.composite");
-
-        try {
-            System.out.println("Sample Feed server started (press enter to shutdown)");
-            System.out.println();
-            System.out.println("To read the aggregated feeds, point your Web browser to the following addresses:");
-            System.out.println("http://localhost:8083/atomAggregator");
-            System.out.println("http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)");
-            System.out.println("http://localhost:8083/rssAggregator");
-            System.out.println("http://localhost:8083/atomAggregator?feedType=rss_2.0");
-            System.out.println("http://localhost:8083/rssAggregator?feedType=atom_1.0");
-            System.out.println();
-            System.in.read();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        // RssFeed feedService = scaDomain.getService(RssFeed.class,
-        // "RssAggregatorComponent");
-        // SyndFeed syndFeed = feedService.get();
-        // SyndFeedOutput output = new SyndFeedOutput();
-        // output.output(syndFeed,new PrintWriter(System.out));
-
-        scaDomain.close();
-        System.out.println("Sample Feed server stopped");
-    }
-}
diff --git a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
deleted file mode 100644
index db26ad9350..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 com.sun.syndication.feed.atom.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.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
deleted file mode 100644
index 62d90bfa3b..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.osoa.sca.annotations.Property;
-
-import com.sun.syndication.feed.atom.Entry;
-
-/**
- * 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).getPublished();
-                Date yDate = ((Entry)yObj).getPublished();
-                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.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
deleted file mode 100644
index df02ba8536..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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.rss 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="feed1">
-   	 		<tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>
-   		</reference>
-   		<reference name="feed2"> 	
-   	 		<tuscany:binding.rss uri="http://www.engadget.com/rss.xml"/>
-   		</reference>
-   		<reference name="sort" target="Sort"/> 	 		
-        <property name="feedTitle">Rss 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="feed1">
-   	 		<tuscany:binding.atom uri="http://www.oreillynet.com/pub/feed/1"/>
-   		</reference>
-   		<reference name="feed2"> 	
-   	 		<tuscany:binding.atom uri="http://www.apachenews.org/atom.xml"/>
-   		</reference>
-        <property name="feedTitle">Atom Sample</property>    		           
-    </component>      
-
-</composite>
diff --git a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index b67fe843ca..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dea3980e4d..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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.0/samples/feed-aggregator-webapp/src/main/webapp/index.html b/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/index.html
deleted file mode 100644
index 3f12c3e157..0000000000
--- a/branches/sca-java-1.0/samples/feed-aggregator-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<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:8080/sample-feed-aggregator-webapp/atomAggregator</a>
-    <br/><a href="atomAggregator/atomsvc">http://localhost:8080/sample-feed-aggregator-webapp/atomAggregator/atomsvc (for the Atom service document)</a>
-    <br/><a href="rssAggregator">http://localhost:8080/sample-feed-aggregator-webapp/rssAggregator</a>
-    <br/><a href="atomAggregator?feedType=rss_2.0">http://localhost:8080/sample-feed-aggregator-webapp/atomAggregator?feedType=rss_2.0</a>
-    <br/><a href="rssAggregator?feedType=atom_1.0">http://localhost:8080/sample-feed-aggregator-webapp/rssAggregator?feedType=atom_1.0</a>
-     
-  </body>
-</html>
-- 
cgit v1.2.3