Move Tuscany from Incubator to top level.

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

25 files changed, 1703 insertions, 0 deletions

diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/DISCLAIMER b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/DISCLAIMER
new file mode 100644
index 0000000000..d68a410903
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/DISCLAIMER
@@ -0,0 +1,8 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software

+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is

+required of all newly accepted projects until a further review indicates that

+the infrastructure, communications, and decision making process have stabilized

+in a manner consistent with other successful ASF projects. While incubation

+status is not necessarily a reflection of the completeness or stability of the

+code, it does indicate that the project has yet to be fully endorsed by the ASF.

+

diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/LICENSE b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/LICENSE
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   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.
+
+
+
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/NOTICE b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/NOTICE
new file mode 100644
index 0000000000..94481d6cfa
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/README b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/README
new file mode 100644
index 0000000000..6f50990e85
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/README
@@ -0,0 +1,50 @@
+Feed-aggregator-webapp Sample
+=============================
+This sample demonstrates using the Feed binding to aggregate ATOM and RSS
+feeds and publish a new aggregated feed in a webapp.
+
+The README in the samples directory (the directory above this) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+As this sample provides a web app there is a manual step where the WAR file
+that contains the sample is copied to your web app container. If you just want 
+to give this sample a go deploy the WAR file (target/sample-feed-aggregator-webapp.war) to your web application server. 
+
+Once the web app is deployed use your browser to visit the following URL:
+
+http://localhost:8080/sample-feed-aggregator-webapp
+
+You will then see the following displayed in your Web browser. 
+
+http://localhost:8083/atomAggregator
+http://localhost:8083/atomAggregator/atomsvc 
+http://localhost:8083/rssAggregator
+http://localhost:8083/atomAggregator?feedType=rss_2.0
+http://localhost:8083/rssAggregator?feedType=atom_1.0
+
+** Please note that if your browser is not configured correctly to receive feed information, you can open each file that contains the feed information.
+
+
+Building And Running The Sample Using Ant 
+-------------------------------------------
+With the binary distribution the sample can be built using Ant as 
+follows
+
+cd feed-aggregator-webapp
+ant package
+
+This should result in a war file (sample-feed-aggregator-webapp.war) in the target directory. Copy this war file to your web app deployment directory and follow instructions at the begining of this README.
+
+
+Building And Running The Sample Using Maven 
+-------------------------------------------
+With either the binary or source distributions the sample can be built and run 
+using Maven as follows. 
+
+cd feed-aggregator-webapp 
+mvn
+
+This should result in a war file (sample-feed-aggregator-webapp.war) in the target directory. Follow the steps described in the previous section for running the web app and for the expected results.
+
+
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/build.xml b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/build.xml
new file mode 100644
index 0000000000..c49eabf772
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/build.xml
@@ -0,0 +1,169 @@
+<!--
+ * 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.    
+-->
+<project name="sample-feed-aggregator-webapp" default="package">
+    <property file="${user.home}/tuscany/build.properties" />
+    <property file="${user.home}/build.properties" />
+
+    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
+    <property name="tuscany.sca.lib.location" value="../../lib"/>
+    <property name="tuscany.sca.modules.location" value="../../modules"/>
+            
+    <path id="project.classpath">
+        <pathelement path="target/classes"/>
+        <pathelement location="${tuscany.sca.manifest.location}"/>
+    </path>
+    	
+    <target name="init">
+        <mkdir dir="target/classes"/>
+    </target>
+	
+    	
+    <target name="compile" depends="init">
+        <javac destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+               <src location="src/main/java"/>
+               <classpath refid="project.classpath"/>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+    </target>	
+	
+    <target name="package" depends="compile">
+        <war destfile="target/sample-feed-aggregator-webapp.war" 
+             webxml="src/main/webapp/WEB-INF/web.xml">
+            <fileset dir="src/main/webapp"/>       	
+            <zipfileset dir="../../modules" prefix="WEB-INF/lib">
+                <include name="tuscany-assembly-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-assembly-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-assembly-xsd-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-binding-feed-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-binding-jsonrpc-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-binding-sca-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-binding-sca-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-binding-ws-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-binding-ws-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-binding-ws-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-contribution-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-contribution-impl-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-contribution-java-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-contribution-namespace-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-core-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-core-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-core-spi-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-databinding-axiom-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-databinding-jaxb-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-databinding-sdo-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-definitions-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-definitions-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-domain-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-domain-api-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-extension-helper-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-host-embedded-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-host-http-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-host-webapp-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-implementation-java-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-implementation-java-runtime-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-implementation-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-interface-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-interface-java-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-interface-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-interface-wsdl-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-interface-wsdl-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-node-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-policy-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-policy-logging-1.0.1-incubating-SNAPSHOT.jar"/>                
+                <include name="tuscany-policy-security-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-policy-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+                <include name="tuscany-sca-api-1.0.1-incubating-SNAPSHOT.jar"/>
+            </zipfileset>
+            <lib dir="../../lib">
+                <include name="activation-1.1.jar"/>
+                <include name="annogen-0.1.0.jar"/>
+                <include name="ant-1.7.0.jar"/>
+                <include name="ant-launcher-1.7.0.jar"/>
+                <include name="axiom-api-1.2.5.jar"/>
+                <include name="axiom-dom-1.2.5.jar"/>
+                <include name="axiom-impl-1.2.5.jar"/>
+                <include name="axis2-adb-1.3.jar"/>
+                <include name="axis2-codegen-1.3.jar"/>
+                <include name="axis2-java2wsdl-1.3.jar"/>
+                <include name="axis2-kernel-1.3.jar"/>
+                <include name="axis2-mtompolicy-1.3.jar"/>
+                <include name="backport-util-concurrent-2.2.jar"/>
+                <include name="cglib-nodep-2.1_3.jar"/>
+                <include name="common-2.2.3.jar"/>
+                <include name="commons-codec-1.3.jar"/>
+                <include name="commons-fileupload-1.1.1.jar"/>
+                <include name="commons-httpclient-3.0.1.jar"/>
+                <include name="commons-io-1.2.jar"/>
+                <include name="commons-logging-1.1.jar"/>
+                <include name="ecore-2.2.3.jar"/>
+                <include name="ecore-change-2.2.3.jar"/>
+                <include name="ecore-xmi-2.2.3.jar"/>
+                <include name="geronimo-activation_1.1_spec-1.0-M1.jar"/>
+                <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
+                <include name="geronimo-javamail_1.4_spec-1.0-M1.jar"/>
+                <include name="geronimo-jms_1.1_spec-1.1.jar"/>
+                <include name="httpcore-4.0-alpha5.jar"/>
+                <include name="httpcore-nio-4.0-alpha5.jar"/>
+                <include name="httpcore-niossl-4.0-alpha5.jar"/>
+                <include name="jaxb-api-2.1.jar"/>
+                <include name="jaxb-impl-2.1.4.jar"/>
+                <include name="jaxen-1.1.1.jar"/>
+                <include name="jaxws-api-2.1.jar"/>
+                <include name="jdom-1.0.jar"/>
+                <include name="json-rpc-1.0.jar"/>
+                <include name="jsr181-api-1.0-MR1.jar"/>
+                <include name="jsr250-api-1.0.jar"/>
+                <include name="mail-1.4.jar"/>
+                <include name="neethi-2.0.2.jar"/>
+                <include name="rampart-core-1.3.jar"/>
+                <include name="rampart-policy-1.3.jar"/>
+                <include name="rampart-trust-1.3.jar"/>
+                <include name="rome-0.9.jar"/>
+                <include name="saaj-api-1.3.jar"/>
+                <include name="stax-api-1.0-2.jar"/>
+                <include name="woden-1.0-incubating-M7b.jar"/>
+                <include name="wsdl4j-1.6.2.jar"/>
+                <include name="wss4j-1.5.3.jar"/>
+                <include name="wstx-asl-3.2.1.jar"/>
+                <include name="xalan-2.7.0.jar"/>
+                <include name="xercesImpl-2.8.1.jar"/>
+                <include name="xml-apis-1.3.03.jar"/>
+                <include name="XmlSchema-1.3.2.jar"/>
+                <include name="xmlsec-1.4.0.jar"/>
+                <include name="xsd-2.2.3.jar"/>
+                <include name="tuscany-sdo-api-r2.1-1.0-incubating.jar"/>
+                <include name="tuscany-sdo-impl-1.0-incubating.jar"/>
+                <include name="tuscany-sdo-lib-1.0-incubating.jar"/>                
+            </lib>	
+            <classes dir="target/classes"/>
+        </war>
+     </target>
+		
+    <target name="clean">
+        <delete quiet="true" includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+</project>
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/pom.xml b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/pom.xml
new file mode 100644
index 0000000000..15eb103959
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/pom.xml
@@ -0,0 +1,73 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.0.1-incubating-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-feed-aggregator-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Atom+RSS Feed Aggregator Sample Webapp</name>
+
+    <repositories>
+       <repository>
+          <id>apache.incubator</id>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>1.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.0.1-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-feed</artifactId>
+            <version>1.0.1-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+
+</project>
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
new file mode 100644
index 0000000000..6d15b5426b
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
@@ -0,0 +1,100 @@
+/*
+ * 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.1/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
new file mode 100644
index 0000000000..05961a315c
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/SampleServer.java
@@ -0,0 +1,54 @@
+/*
+ * 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.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
new file mode 100644
index 0000000000..db26ad9350
--- /dev/null
+++ b/branches/sca-java-1.0.1/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 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.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
new file mode 100644
index 0000000000..62d90bfa3b
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
@@ -0,0 +1,58 @@
+/*
+ * 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.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
new file mode 100644
index 0000000000..df02ba8536
--- /dev/null
+++ b/branches/sca-java-1.0.1/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.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.1/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/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.0.1/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.0.1/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.0.1/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.0.1/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.0.1/samples/feed-aggregator-webapp/src/main/webapp/index.html b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
new file mode 100644
index 0000000000..3f12c3e157
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator-webapp/src/main/webapp/index.html
@@ -0,0 +1,34 @@
+<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>
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator/DISCLAIMER b/branches/sca-java-1.0.1/samples/feed-aggregator/DISCLAIMER
new file mode 100644
index 0000000000..d68a410903
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/DISCLAIMER
@@ -0,0 +1,8 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software

+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is

+required of all newly accepted projects until a further review indicates that

+the infrastructure, communications, and decision making process have stabilized

+in a manner consistent with other successful ASF projects. While incubation

+status is not necessarily a reflection of the completeness or stability of the

+code, it does indicate that the project has yet to be fully endorsed by the ASF.

+

diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator/LICENSE b/branches/sca-java-1.0.1/samples/feed-aggregator/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/LICENSE
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   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.
+
+
+
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator/NOTICE b/branches/sca-java-1.0.1/samples/feed-aggregator/NOTICE
new file mode 100644
index 0000000000..94481d6cfa
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator/README b/branches/sca-java-1.0.1/samples/feed-aggregator/README
new file mode 100644
index 0000000000..f9daa95a11
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/README
@@ -0,0 +1,101 @@
+Feed Aggregator Sample
+======================================
+This sample demonstrates using the Feed binding to aggregate ATOM and RSS
+feeds and publish a new aggregated feed.
+
+The README in the samples directory (the directory above this) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+If you run the sample using ant, navigate to this sample directory and do:
+
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-feed-aggregator.jar feed.SampleServer
+
+and on *nix do
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-feed-aggregator.jar feed.SampleServer
+
+You should see the following output on the screen.
+
+run:
+    [java] Added Servlet mapping: http://localhost:8083/rssAggregator
+    [java] Added Servlet mapping: http://localhost:8083/atomAggregator/*
+    [java] Sample Feed server started (press enter to shutdown)
+
+    [java] To read the aggregated feeds, point your Web browser to the following addresses:
+    [java] http://localhost:8083/atomAggregator
+    [java] http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)
+    [java] http://localhost:8083/rssAggregator
+    [java] http://localhost:8083/atomAggregator?feedType=rss_2.0
+    [java] http://localhost:8083/rssAggregator?feedType=atom_1.0
+     
+As this point the aggregated Feeds are exposed by a web server started
+automatically by the SCA runtime. You can later stop the server by pressing enter.
+
+Now that the server is started you can point your Web browser to each URL of the
+aggregated feeds to see the information in your broswer. These URLs are:
+
+http://localhost:8083/atomAggregator
+http://localhost:8083/atomAggregator/atomsvc 
+http://localhost:8083/rssAggregator
+http://localhost:8083/atomAggregator?feedType=rss_2.0
+http://localhost:8083/rssAggregator?feedType=atom_1.0
+
+** Please note that if your browser is not configured correctly to receive feed information, you will be prompted to open each file that contains the feed information in xml.
+
+Sample Overview
+---------------
+The sample provides a single component exposing a Web resource.
+
+web-resource/
+  src/
+    main/
+      java/
+        feed/
+          FeedAggregatorImpl.java         - implementation of the Feed
+                                            aggregator component
+          SampleServer.java               - starts the SCA Runtime and 
+                                            publishes the aggregated feeds
+      resources/
+        FeedAggregator.composite          - the SCA assembly for this sample
+  feed-aggregator.png                     - a pictorial representation of the 
+                                            sample .composite file
+  build.xml                               - the Ant build file
+  pom.xml                                 - the Maven build file        
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built and run using Ant using the 
+following commands
+
+cd feed-aggregator
+ant compile
+ant run
+
+You should see the following output from the run target.
+
+run:
+    [java] Added Servlet mapping: http://localhost:8083/rssAggregator
+    [java] Added Servlet mapping: http://localhost:8083/atomAggregator/*
+    [java] Sample Feed server started (press enter to shutdown)
+
+    [java] To read the aggregated feeds, point your Web browser to the following addresses:
+    [java] http://localhost:8083/atomAggregator
+    [java] http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)
+    [java] http://localhost:8083/rssAggregator
+    [java] http://localhost:8083/atomAggregator?feedType=rss_2.0
+    [java] http://localhost:8083/rssAggregator?feedType=atom_1.0
+     
+ 
+Building The Sample Using Maven 
+-------------------------------------------
+With either the binary or source distributions the sample can be built using
+Maven as follows.
+
+cd feed-aggregator
+mvn
+
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator/build.xml b/branches/sca-java-1.0.1/samples/feed-aggregator/build.xml
new file mode 100644
index 0000000000..2118e13db7
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/build.xml
@@ -0,0 +1,72 @@
+<!--
+ * 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.    
+-->
+<project name="feed-aggregator" default="compile">
+    <property name="test.class" value="feed.SampleServer" />
+	<property name="test.jar"   value="sample-feed-aggregator.jar" />
+	
+    <target name="init">
+        <mkdir dir="target/classes"/>
+    </target>
+	
+    <target name="compile" depends="init">
+        <javac srcdir="src/main/java"
+               destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <classpath>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+        <jar destfile="target/${test.jar}" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="${test.class}" /> 
+            </manifest>
+        </jar>    	
+    </target>	
+	
+    <target name="run-classes">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/classes"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>
+    </target>
+	
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/${test.jar}"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>    	
+    </target>	
+	
+    <target name="clean">
+        <delete quiet="true" includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+</project>
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator/pom.xml b/branches/sca-java-1.0.1/samples/feed-aggregator/pom.xml
new file mode 100644
index 0000000000..b9a27cade9
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/pom.xml
@@ -0,0 +1,79 @@
+<?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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.0.1-incubating-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-feed-aggregator</artifactId>
+    <name>Apache Tuscany SCA Atom+RSS Feed Aggregator Sample</name>
+
+    <repositories>
+       <repository>
+          <id>apache.incubator</id>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.0.1-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-feed</artifactId>
+            <version>1.0.1-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.0.1-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+
+</project>
diff --git a/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
new file mode 100644
index 0000000000..6d15b5426b
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
@@ -0,0 +1,100 @@
+/*
+ * 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.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
new file mode 100644
index 0000000000..05961a315c
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/SampleServer.java
@@ -0,0 +1,54 @@
+/*
+ * 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.1/samples/feed-aggregator/src/main/java/feed/Sort.java b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/Sort.java
new file mode 100644
index 0000000000..db26ad9350
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/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 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.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
new file mode 100644
index 0000000000..62d90bfa3b
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/java/feed/SortImpl.java
@@ -0,0 +1,58 @@
+/*
+ * 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.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/branches/sca-java-1.0.1/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
new file mode 100644
index 0000000000..df02ba8536
--- /dev/null
+++ b/branches/sca-java-1.0.1/samples/feed-aggregator/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.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>