Updating legal files for 2.0-M1 release

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

8 files changed, 158 insertions, 597 deletions

diff --git a/java/sca/distribution/all/src/main/release/CHANGES b/java/sca/distribution/all/src/main/release/CHANGES
index 3de7358ec6..7b772d8d72 100644
--- a/java/sca/distribution/all/src/main/release/CHANGES
+++ b/java/sca/distribution/all/src/main/release/CHANGES
@@ -1,431 +1,23 @@
-Changes With Apache Tuscany SCA 1.2 (incubating) April 2008 

+Changes With Apache Tuscany SCA 2.0-M1 February 2009

 ===========================================================

 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-2027

-  * TUSCANY-1999

-  * TUSCANY-2037

-  * TUSCANY-2034

-  * TUSCANY-2038

-  * TUSCANY-2043

-  * TUSCANY-2046

-  * TUSCANY-2047

-  * TUSCANY-2028

-  * TUSCANY-1873

-  * TUSCANY-2049

-  * TUSCANY-2035

-  * TUSCANY-1206

-  * TUSCANY-2036 

-  * TUSCANY-1771

-  * TUSCANY-2013

-  * TUSCANY-1926

-  * TUSCANY-1917

-  * TUSCANY-1949

-  * TUSCANY-1941

-  * TUSCANY-2045

-  * TUSCANY-2057

-  * TUSCANY-2055

-  * TUSCANY-2056

-  * TUSCANY-2072

-  * TUSCANY-2047

-  * TUSCANY-2073

-  * TUSCANY-1977 

-  * TUSCANY-2075

-  * TUSCANY-1894

-  * TUSCANY-2079

-  * TUSCANY-2078

-  * TUSCANY-2080

-  * TUSCANY-2068

-  * TUSCANY-1950

-  * TUSCANY-2077

-  * TUSCANY-2056

-  * TUSCANY-2088

-  * TUSCANY-2086

-  * TUSCANY-2094

-  * TUSCANY-2106 

-

   Features and/or Enhancements

 

   * Core

-    - Interceptor Enhancements

-      - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked

-      - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference

-      - PolicyProvider SPIs to allow extensions to plugin policy interceptors

-    - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification

-    - Improvement of contribution service to allow it to be used outside of the runtime environment 

-    - Support for Contribution Import/Export resource

-    - Enhanced Distributed Domain story using Workspace

-      - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites

-        - Set of core services providing management capabilities

-        - Administration web interface

-        - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.

-    - Enhanced support for SCA Policy spec

-      - Ability to apply external policy definitions to a SCA composition

-      - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain

-      - Bug fixes

-    - Improvements of http binding to support servlet components

-    - Enable Tuscany to run inside an OSGi runtime

+    - Enable Tuscany to run inside an OSGi runtime
+    - Updated SCA API packages based on OASIS Open CSA specification drafts

 

-  * Web 2.0 Extensions

-    - Enhancements to implementation.widget (support for properties)

-    - New atom binding based on Apache Abdera

-    - Refactoring of rss-rome binding

   * Other Extensions

-    - Binding JMS

-      - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec

-      - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html

-    - Enhancements to Binding RMI

-      - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict

-    - Enhancements to Groovy extension

-      - Support for 'native' groovy classes

-    - Enhancements to OSGi bundle contributions

-      - Support Bundle URLs to be added as contributions

-

-  * Tools

-    - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
-       - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager

-

-  * Samples/Tutorial/Demos

-    - calculator-distributed migrated to use new Tuscany Distributed Workspace

-    - sample-calculator-ws-secure-webapp

-    - sample-helloworld-jms-webapp

-    - new jms samples

-    - improve bigbank demo to include support for policies 

-    - tutorial store changes

-      - use of import/export

-      - development of contribution without requiring dependencies on the Tuscany runtime

-      - usage of new sca domain infrastructure

-

-  * Testing

-    - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)

-

-

-Changes With Apache Tuscany SCA 1.1 (incubating) January 2008 

-===============================================================

-

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1939

-  * TUSCANY-1914

-  * TUSCANY-1854

-  * TUSCANY-1931

-  * TUSCANY-1547

-  * TUSCANY-1909

-  * TUSCANY-1919

-  * TUSCANY-1930

-  * TUSCANY-1806

-  * TUSCANY-1804

-  * TUSCANY-1916

-  * TUSCANY-1913

-  * TUSCANY-1834

-  * TUSCANY-1857

-  * TUSCANY-1687

-  * TUSCANY-1801

-  * TUSCANY-1742

-  * TUSCANY-1762

-  * TUSCANY-1945

-  * TUSCANY-1595

-  * TUSCANY-1594

-  * TUSCANY-1849

-  * TUSCANY-1836

-  * TUSCANY-1934

-  * TUSCANY-1902

-  * TUSCANY-1608

-  * TUSCANY-1943

-  * TUSCANY-1896

-  * TUSCANY-1626

-  * TUSCANY-1797

-  * TUSCANY-1601

-  * TUSCANY-1415

-

-- Better JMS support

-  * binding.jms supporting point to point text based messaging only

-  * New SOAP/JMS sample (helloworld-ws-reference/service-jms)

-

-- Improvements in PolicyFramework Support

-  * Support for policy specifications on operation elements in a composite definition

-  * Separate sample (calculator-implementation-policies) to demonstrate use of Implementation Policies 

-    (uses logging and JAAS Authentication)

-

-- Modeling of client side java script components

-  * See implementation.widget

-

-- Evolving support for doman API suggested by assembly spec including a standalone node and nodes running 

-  connected together in a domain. This is still experimental. 

- 

-- Class loading and OSGI improvements

-  * Enable Tuscany to be run in a multi-classloader environment including inside OSGi. By default,

-    Tuscany continues to run using a single CLASSPATH-based classloader.

-  * Contributions no longer need to be in the CLASSPATH. All import/export dependencies across contributions should be 

-    explicitly specified (as described in the spec).

-

-- JAXB based POJO transformations

-

-Changes With Apache Tuscany SCA 1.0.1 (incubating) November 2007 

-================================================================

-

-The Tuscany SCA Java 1.0.1 is mainly a bug-fix release. It also comes with some improvements as listed below.

- 

-- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):

-  * TUSCANY-1848

-  * TUSCANY-1857

-  * TUSCANY-1859

-  * TUSCANY-1801

-  * TUSCANY-1823

-  * TUSCANY-1839

-  * TUSCANY-1814

-  * TUSCANY-1818

-  * TUSCANY-1834

-  * TUSCANY-1637

-  * TUSCANY-1826

-  * TUSCANY-1823

-  * TUSCANY-1819

-  * TUSCANY-1821

-  * TUSCANY-1822

-  * TUSCANY-1806

-  * TUSCANY-1808

-  * TUSCANY-1756

-  * TUSCANY-1757

-

-- Fix build issues with Maven 2.0.7 and JDK 6

-

-- Reduce memory consumption for WSDLs that import large XSDs

-

-- Add more logging statements for better servicibility

-

-- Add an extension point to allow extensions to plug-in extension schemas.

-

-- Add a demo application to showcase XML integration story 

-

-- Improve in databinding framework

-  * Add support for JSON Databindings and other refactoring

-  * Set databinding for introspected data type and enhance the checking of wrapper style

-  * Improve the tree-based XMLStreamReader and convert Bean & DOM to use this approach

-  * Add a tree-iterator based XMLStreamReader base impl

-  * Add default element info to java interface

-  * Rename Interface.setDefaultDataBinding to resetDataBinding

-

-- Limit the method injection to setters and allow the setter annotation to override field annotation

-

-- Evolving support in Intent and Policy handling

-  * Add support for policies in implementation

-  * Fix the algorithm for macthing policySets defined on bindings for the wire

-  * Add policy intent for implementation.java

-  * Extend java implementation type to recognize and apply policies, adding util support for this in Policy module

-  * Add policy module for logging

-

-- Evolving development in the SCA Domain/Node

-

-- Update NOTICE files with missing dependencies

-

-

-Changes With Apache Tuscany SCA 1.0 (incubating) September 2007 

-===============================================================

-

-- Tuscany Java SCA now implements V1.0 of the core SCA 

-  specifications

-        SCA Assembly Model V1.0

-        SCA Java Common Annotations and APIs V1.0

-        SCA Java Component Implementation V1.0

-        SCA Web Services Binding V1.0

-  Including callbacks, conversations and callable references

-  

-

-- Support for ws-security configurable in the web services binding

-  thro Tuscany SCA policy intents and policysets using the policy framework 

-  introduced in the last release.  

-  

-  Note : This release supports specifications of policies around axis2

-         config params - see helloworld-ws-service-secure sample.  The policy

-         intents that have been tested are authentication, integrity and 

-         confidentiality.  

-         There is no sample or test that exercises confidentiality since there

-         are some unresolved licensing issue around bouncycastle libraries.  

-         However, users who are not encumbered by the bouncycastle license 

-         restrictions can try the 'confidentiality' intent. See FAQ - 

-         http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html

-                

-         This release does not include support for WS-Policy

-         attachments in Tuscany Policysets for ws-security.

-         

-  

-- An XQuery component implementation type 

-        implementation-xquery

-        

-

-- A Databinding for converting data to and from nodes for XQuery 

-  processing

-        databinding-saxon

-        

-

-- OSGI support has been extended to allow Tuscany contributions 

-  packaged as OSGI bundles hence taking advantage of OSGI's bundle

-  loading an dependency management capabilities 

-  

-

-- A BPEL component implementation type experimental implementation

-based on SCA BPEL Client and Implementation V1.0. At the moment only

-supports BPEL process as services.

-	implementation-bpel

-

-

-- The distributed runtime implementation has been separated out 

-  into 

-        *) domain

-        *) node

-  It is now wrapped by a SCADomain interface as is the standalone 

-  runtime.

-  

-  Note: This release does not include support for WebApp host deployment 

-        for a distributed SCA Domain 

-  

-

-

-- The web service binding will now generate WSDL automatically

-  based on the service interface if no WSDL is provided

-  

-

-- A new "store" sample and associated document show how a 

-  simple store front application can be constructed 

-        samples/store

-        

-- The following features of this release are still experimental:

-     - BPEL implementation type, integrating with Apache ODE

-     - OSGI implementation type, integrating with Apache Felix

-     - XQuery implementation type

-

- 

-

-Changes With Apache Tuscany SCA 0.99 (incubating) August 2007 

-=============================================================

-

-The following are the significant additions to release 0.99 

-over and above all of what was offered in release 0.91.

-

-- A version of the default sca binding that works between

-  components runing in separate Java virtual machines

-       binding-sca-axis

-

-- A simple node implementation and a service discovery 

-  function for running sca applications distributed 

-  across more than one node

-       distributed

-       distributed-impl 

-

-- integration with OSGi runtimes is now supported with

-  a new implementation-osgi component type

-

-- PUB/SUB interactions are now supported by using new 

-  notification binding and implementation types, and

-  samples demonstrating the feature.

-

-- The Tuscany runtime now has a policy framework supporting

-  the SCA policy specification

-

-- the endpoint URIs used by SCA bindings has been rationalized 

-  and now follows the SCA Assembly specification

-

-- binding-ajax has been renamed to binding-dwr

-

-Changes With Apache Tuscany SCA 0.91 (incubating) July 2007 

-===========================================================

-

-The following are the significant additions to release 0.91 

-over and above all of what was offered in release 0.90.

-

-

-- Enhancements to support multiple contributions to the SCA Domain

-

-- The inclusion of a alternative simplified extensions-helper

-SPI layer to faciliate rapid development of extensions

-

-- More Implementation Extenstions

-        Spring

-        WebResource

-

-- More Binding Extensions

-        AJAX

-        EJB

-        RSS/ATOM Feeds

-        

-- Demos that demonstrate the use of a mix of extensions

-         alert-aggregator-webapp

-         bigbank-account

-         bigbank-calculator

-         bigbank-stockquote

-

-

-- Samples

-        Samples to demostrate use of Spring, Resource, AJAX extensions

-

-Changes With Apache Tuscany SCA 0.90 (incubating) June 2007 

-===========================================================

-

-- Implementations for all of the Java Annotations and API Specification V1.0 found at

-  (http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications) 

-  apart from the following.

-    @ComponentName

-    Conversation

-    RequestContext

-    

-- New assembly model implementation taking into account SCA 1.0 artifacts 

-  Data duplication between assembly model and runtime removed

-

-- Simple single process domain support

-  Contribution support to scope items being deployed into the runtime

-

-- Improved Package/Class naming consistency across modules

-

-- Extensions now loaded via Java service mechanism

-  Refactored extensions to use new SPIs (see below)

-

-- Maven and Ant based sample builds in the binary distribution

-

-- Implementation Extensions

-    Java

-    Script supporting (Ruby, Python, Groovy, JavaScript)

-

-- Binding Extensions

-    Axis2

-    RMI

-    JSONRPC

-

--Databinding Extensions

-    Axiom

-    JAXB

-    SDO

-

-- Host environments

-    Embedded

-    Tomcat

-    Jetty

-    RMI

-

-- A clear set of SPIs intended to be stable over future releases

-    SCA assembly model

-      org.apache.tuscany.sca.assembly

-      org.apache.tuscany.sca.interfacedef

-      org.apache.tuscany.sca.interfacedef.java

-      org.apache.tuscany.sca.interfacedef.wsdl

-      org.apache.tuscany.sca.policy

-

-    SCA contribution model

-      org.apache.tuscany.sca.contribution

-

-    Runtime extensions

-      org.apache.tuscany.sca.core

-      org.apache.tuscany.sca.invocation

-      org.apache.tuscany.sca.provider

-      org.apache.tuscany.sca.runtime

-      org.apache.tuscany.sca.work

-

-    Data binding support

-      org.apache.tuscany.sca.databinding

-

-    Embedding Tuscany

-      org.apache.tuscany.sca.host.embedded

-

-    Servlet container integration

-      org.apache.tuscany.sca.http

-

-- For this point release a partial set of JavaDoc is provided to 

-  be filled out as we close on release 1.0

+    - Binding RMI
+	- RMI Binding
+    - Binding WS

+        - WebServices Binding

+

+  * Samples/Tutorial/Demos
+	- binding-ws-calculator/
+	- calculator/
+	- calculator-equinox/
+	- calculator-osgi/
+	- calculator-rmi-reference/
+	- calculator-rmi-service/
+	- implementation-java-calculator

diff --git a/java/sca/distribution/all/src/main/release/README b/java/sca/distribution/all/src/main/release/README
index 4d83dcfde9..e0869c7d27 100644
--- a/java/sca/distribution/all/src/main/release/README
+++ b/java/sca/distribution/all/src/main/release/README
@@ -1,7 +1,7 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 README
+Apache Tuscany SCA 2.0-M1 February 2009 README
 =====================================================
 
-Welcome to the Tuscany SCA 1.2 release. 
+Welcome to the Tuscany SCA 2.0-M1 release. 
 
 See the RELEASE_NOTES file for information specific to this release.
 
diff --git a/java/sca/distribution/all/src/main/release/RELEASE_NOTES b/java/sca/distribution/all/src/main/release/RELEASE_NOTES
index a04ef5c553..4aa75e33fa 100644
--- a/java/sca/distribution/all/src/main/release/RELEASE_NOTES
+++ b/java/sca/distribution/all/src/main/release/RELEASE_NOTES
@@ -1,4 +1,4 @@
-Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
+Apache Tuscany SCA 2.0-M1 February 2009 Release Notes
 ============================================================
 
 Apache Tuscany provides a runtime based on the Service Component
@@ -9,41 +9,29 @@ of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.or
 Overview
 --------
 
-     The Apache Tuscany SCA 1.2 release includes implementations of the
-     main SCA specifications including:
+     The Apache Tuscany SCA 2.0-M1 release includes implementations of the
+     main SCA specifications and recent updates from Open CSA drafts including:
 
         SCA Assembly Model V1.0
         SCA Policy Framework V1.0
         SCA Java Common Annotations and APIs V1.0
         SCA Java Component Implementation V1.0
-        SCA Spring Component Implementation V1.0
-        SCA BPEL Client and Implementation V1.0
         SCA Web Services Binding V1.0
-        SCA EJB Session Bean Binding V1.0
 
     It also includes implementations of many features not yet defined
     by SCA specifications, including:
 
-        - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds, 
-          HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
-        - SCA implementation types for OSGI, XQuery, BPEL, Widget and various 
-          dynamic languages including Groovy, Javascript, Python and Ruby
-        - Databindings for Service Data Objects (SDO), JAXB, XmlBeans, 
-          Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
+        - SCA bindings for RMI.
+        - Databindings for JAXB, Axis2's AXIOM, DOM, SAX and StAX
 
     The Tuscany SCA Runtime can be configured as a single node SCA domain or 
     as an SCA domain distributed across multiple nodes. 
     In addition Tuscany SCA supports the following host-deployment options: -
         - running standalone 
+        - running in a OSGi enabled runtime Environment (Equinox)
         - running with distributed nodes across multiple JVMs
-        - running with embedded Jetty or Tomcat
-        - running as part of a standard web application                                     
      
-    The Wepapp samples included in this release have been tried and tested on 
-        - Tomcat 5.5.20 and Tomcat 6.0.14
-        - Jetty 6.1.3
-        - Geronimo 2.0.2 Tomcat6 jee5
-        - WebSphere 6.1 fix pack 9
+
 
 See the CHANGES file for a detailed list of the features in this release.
 
@@ -52,15 +40,15 @@ Support
 
 For more information on Apache Tuscany visit the website at:
 
-    http://incubator.apache.org/tuscany/
+    http://tuscany.apache.org/tuscany/
  
 Any issues with this release can be reported to Apache Tuscany
 using the mailing lists or in the JIRA issue tracker.
 
     Mailing list archives:
 
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
-       http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
+       http://mail-archives.apache.org/mod_mbox/tuscany-user/
+       http://mail-archives.apache.org/mod_mbox/tuscany-dev/
 
     Jira:
 
diff --git a/java/sca/distribution/all/src/main/release/bin/INSTALL b/java/sca/distribution/all/src/main/release/bin/INSTALL
index 2da53a2b44..40ecb5f7e4 100644
--- a/java/sca/distribution/all/src/main/release/bin/INSTALL
+++ b/java/sca/distribution/all/src/main/release/bin/INSTALL
@@ -1,10 +1,9 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
+Installing the Apache Tuscany SCA 2.0-M1 February 2009 Release binary distribution
 =========================================================================================
 
 Unzip Tuscany binary distribution archive and you get the following:
 
 tuscany-sca-1.1-incubating        
-   DISCLAIMER    - the ASF incubation disclaimer
    INSTALL       - this help file
    LICENSE       - the Apache License and any dependecy licenses
    NOTICE        - attribution notices associated with the licenses
@@ -12,16 +11,14 @@ tuscany-sca-1.1-incubating
    RELEASE_NOTES - description of this release 
    CHANGES       - A note of the major changes in this release
 
-   /demos        - Demo applications showcasing the use of Apache Tuscany 
+   /bin		 - Tuscany launcher ???
 
-   /lib          - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
+   /features     - OSGi runtime configuration, Tuscany manifest and PDE target
 
    /modules      - all of the individual Tuscany jars
 
    /samples      - all the Tuscany samples, see the README in that directory
 
-   /tutorial     - The store tutorial, see the README in that directory
-
 
 
 
diff --git a/java/sca/distribution/all/src/main/release/bin/LICENSE b/java/sca/distribution/all/src/main/release/bin/LICENSE
index 5e1f585d46..605b561ee0 100644
--- a/java/sca/distribution/all/src/main/release/bin/LICENSE
+++ b/java/sca/distribution/all/src/main/release/bin/LICENSE
@@ -226,32 +226,33 @@ The following components come under Apache Software License 2.0
  activeio-2.0-r118.jar
  activeio-core-3.0.0-incubator.jar
  apache-activemq-4.1.1.jar
+ app-1.0.0-v20070606.jar
  addressing-1.3.mar
  annogen-0.1.0.jar
  annotations-api-6.0.14.jar
  aopalliance-1.0.jar
- axiom-api-1.2.5.jar
- axiom-dom-1.2.5.jar
- axiom-impl-1.2.5.jar
- axis2-adb-1.3.jar
- axis2-codegen-1.3.jar
- axis2-java2wsdl-1.3.jar
- axis2-kernel-1.3.jar
- axis2-mtompolicy-1.3.jar
- bsf-all-3.0-beta2.jar
+ axiom-api-1.2.7.jar
+ axiom-dom-1.2.7.jar
+ axiom-impl-1.2.7.jar
+ axis2-adb-1.4.1.jar
+ axis2-codegen-1.4.1.jar
+ axis2-kernel-1.4.1.jar
+ axis2-java2wsdl-1.4.1.jar
+ axis2-mtompolicy-1.4.1.jar
+ axis-ant-1.4.jar
  catalina-6.0.14.jar
- cglib-nodep-2.1_3.jar
+ cglib-nodep-2.2.jar
  commons-collections-3.1.jar
- commons-codec-1.3.jar
- commons-fileupload-1.1.1.jar
- commons-httpclient-3.0.1.jar
- commons-io-1.2.jar
+ commons-codec-1.2.jar
+ commons-fileupload-1.2.jar
+ commons-httpclient-3.1.jar
+ commons-io-1.4
  commons-jexl-1.1.jar
  commons-lang-2.1.jar
- commons-logging-1.1.jar
+ commons-logging-1.1.1.jar
  coyote-6.0.14.jar
  derby-10.1.3.1.jar
- geronimo-activation_1.1_spec-1.0-M1.jar
+ geronimo-activation_1.1_spec-1.0.1.jar
  geronimo-common-1.2-beta.jar
  geronimo-commonj_1.1_spec-1.0.jar
  geronimo-connector-1.2-beta.jar
@@ -263,9 +264,10 @@ The following components come under Apache Software License 2.0
  geronimo-j2ee-connector_1.5_spec-1.1.jar
  geronimo-j2ee-jacc_1.0_spec-1.1.jar
  geronimo-j2ee-management_1.0_spec-1.1.jar
- geronimo-javamail_1.4_spec-1.0-M1.jar
+ geronimo-javamail_1.4_spec-1.2.jar
  geronimo-jms_1.1_spec-1.1.jar
  geronimo-jpa_3.0_spec-1.0.jar
+ geronimo-jsp_2.1_spec-1.0.jar
  geronimo-jta_1.0.1B_spec-1.0.jar
  geronimo-kernel-1.2-beta.jar
  geronimo-management-1.2-beta.jar
@@ -273,64 +275,45 @@ The following components come under Apache Software License 2.0
  geronimo-security-1.2-beta.jar
  geronimo-spec-j2ee-connector-1.5-rc4.jar
  geronimo-spec-jta-1.0.1B-rc4.jar
+ geronimo-stax-api_1.0_spec-1.0.1.jar
  geronimo-system-1.2-beta.jar
  geronimo-transaction-1.2-beta.jar
  geronimo-util-1.2-beta.jar
- httpcore-4.0-alpha5.jar
- httpcore-nio-4.0-alpha5.jar
+ httpcore-4.0-beta1.jar
+ httpcore-nio-4.0-beta1.jar
  httpcore-niossl-4.0-alpha5.jar
  jettison-1.0-RC2.jar
  jetty-6.1.7.jar
  jetty-util-6.1.7.jar
  json-rpc-1.0.jar
  juli-6.0.14.jar
- log4j-1.2.12.jar
+ log4j-1.2.15.jar
+ mex-1.41-impl.jar
  logkit-1.0.1.jar
- neethi-2.0.2.jar
- ode-bpel-api-1.1.jar
- ode-bpel-compiler-1.1.jar
- ode-bpel-dao-1.1.jar
- ode-bpel-epr-1.1.jar
- ode-bpel-obj-1.1.jar
- ode-bpel-runtime-1.1.jar
- ode-bpel-schemas-1.1.jar
- ode-bpel-store-1.1.jar
- ode-dao-jpa-1.1.jar
- ode-dao-jpa-ojpa-derby-1.1.zip
- ode-jacob-1.1.jar
- ode-jacob-ap-1.1.jar
- ode-scheduler-simple-1.1.jar
- ode-utils-1.1.jar
- openjpa-all-0.9.7-incubating.jar
- openjpa-persistence-0.9.7-incubating.jar
+ neethi-2.0.4.jar
  org.apache.felix.bundlerepository-1.0.2.jar
  org.apache.felix.framework-1.0.3.jar
  org.apache.felix.main-1.0.3.jar
  org.apache.felix.shell-1.0.0.jar
  org.apache.felix.shell.tui-1.0.0.jar
- rampart-core-1.3.jar
- rampart-policy-1.3.jar
- rampart-trust-1.3.jar
+ rampart-core-1.4.jar
+ rampart-policy-1.4.jar
+ rampart-trust-1.4.jar
  regexp-1.3.jar
- spring-beans-2.0.6.jar
- spring-context-2.0.6.jar
- spring-core-2.0.6.jar
  tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.0-incubating.jar
- tuscany-sdo-impl-1.0-incubating.jar
- tuscany-sdo-lib-1.0-incubating.jar
- tuscany-sdo-tools-1.0-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
+ woden-api-1.0M8.jar
+ woden-impl-dom-1.0M8.jar
+ wss4j-1.5.4.jar
+ wstx-asl-3.2.4.jar
  xalan-2.7.0.jar
  xbean-naming-2.7.jar
  xercesImpl-2.8.1.jar
  xml-apis-1.3.03.jar
  xmlbeans-2.3.0.jar
+ xmlParserAPIs-2.6.0.jar
  xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
- XmlSchema-1.3.2.jar
+ xmlsec-1.4.2.jar
+ XmlSchema-1.4.2.jar
 
 ===============================================================================
 axion-1.0-M3-dev.jar 
@@ -438,9 +421,15 @@ The EMF jars;
    codegen-2.2.3.jar 
    codegen-ecore-2.2.3.jar
    common-2.2.3.jar
+   common-3.3.0-v20070426.jar
+   contenttype-3.2.100-v20070319.jar
    ecore-2.2.3.jar
    ecore-change-2.2.3.jar
    ecore-xmi-2.2.3.jar
+   jobs-3.3.0-v20070423.jar
+   osgi-3.3.0-v20070530.jar
+   registry-3.3.0-v20070522.jar
+   runtime-3.3.100-v20070530.jar
    xsd-2.2.3.jar
 
 Eclipse Public License - v 1.0
@@ -1485,12 +1474,12 @@ JPython version 1.1.x
 The jars; 
 activation-1.1.jar, 
 jaxb-api-2.1.jar, 
-jaxb-impl-2.1.6.jar, 
+jaxb-impl-2.1.9.jar, 
 jaxb-xjc-2.1.4.jar, 
 jaxb2-reflection-2.1.4.jar,
+jaxws-api-2.1.jar, 
 jsr181-api-1.0-MR1.jar, 
 jsr250-api-1.0.jar, 
-jaxws-api-2.1-1.jar, 
 mail-1.4.jar, 
 saaj-api-1.3.jar, 
 servlet-api-2.5.jar, 
@@ -1974,7 +1963,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
 
 ===============================================================================
 
-backport-util-concurrent-2.2.jar:
+backport-util-concurrent-3.1.jar :
 
 The software comprising backport-util-concurrent is based in large
 part on the code from JSR166, and the package dl.util.concurrent.
@@ -2253,6 +2242,74 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+================================================================================

+

+The jaxen-1.1.1.jar:

+

+ $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $

+

+ Copyright 2003-2006 The Werken Company. All Rights Reserved.

+ 

+ Redistribution and use in source and binary forms, with or without

+ modification, are permitted provided that the following conditions are

+ met:

+

+  * Redistributions of source code must retain the above copyright

+    notice, this list of conditions and the following disclaimer.

+

+  * Redistributions in binary form must reproduce the above copyright

+    notice, this list of conditions and the following disclaimer in the

+    documentation and/or other materials provided with the distribution.

+

+  * Neither the name of the Jaxen Project nor the names of its

+    contributors may be used to endorse or promote products derived 

+    from this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER

+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+================================================================================
+The asm-all-3.1.jar are distributed under the license:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
 ================================================================================
 
 The tuscany-assembly-xsd jar includes XSD files under the following SCA Collaboration license:
@@ -2298,69 +2355,3 @@ No other rights are granted by implication, estoppel or otherwise.
 
 Revision level 1.1, last updated on 2007/11/19
 
-================================================================================
-License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.0-incubating.jar)
-
-These files being ...
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-
-License for the Service Data Objects JavaDoc and Interface Definition files.
-
-The Service Data Objects Specification is being provided by the copyright holders under the following 
-license. By using and/or copying this work, you agree that you have read, understood and will comply with 
-the following terms and conditions:
-
-Permission to copy, display and distribute the Service Data Objects Specification and/or portions thereof, without 
-modification, in any medium without fee or royalty is hereby granted, provided that you include the 
-following on ALL copies of the Service Data Objects Specification, or portions thereof, that you make:
-
-1. A link or URL to the Service Data Objects Specification at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2. The full text of this copyright notice as shown in the Service Data Objects Specification.
-
-BEA, IBM, Oracle, Primeton Technologies, Rogue Wave Software, SAP, Software AG, Sun Microsystems, Xcalia, 
-Zend Technologies (collectively, the “Authors”) agree to grant you a royalty-free license, under reasonable, 
-non-discriminatory terms and conditions to patents that they deem necessary to implement the Service Data 
-Objects Specification. 
-
-THE Service Data Objects SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR 
-WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, 
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL 
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SERVICE DATA OBJECTS 
-SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity 
-pertaining to the Service Data Objects Specification or its contents without specific, written prior 
-permission. Title to copyright in the Service Data Objects Specification will at all times remain with the 
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-================================================================================
-
diff --git a/java/sca/distribution/all/src/main/release/bin/NOTICE b/java/sca/distribution/all/src/main/release/bin/NOTICE
index 5daa9a3dfe..f54fc10e39 100644
--- a/java/sca/distribution/all/src/main/release/bin/NOTICE
+++ b/java/sca/distribution/all/src/main/release/bin/NOTICE
@@ -8,14 +8,6 @@ This product includes/uses XmlSchema developed at
 The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)
  Portions Copyright 2006 International Business Machines Corp.
 
-This product includes/uses ode-bpel-api-1.1 developed at
-The Apache Software Foundation (http://ode.apache.org)
- - Copyright 1999-2006 Intalio - This product includes software developed by Intalio (http://www.intalio.com)
- - Copyright 2006 Sybase - This product includes software developed by Sybase.(http://www.sybase.com)
-
-"This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
 This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),
 developed by Mort Bay Consulting  (http://www.mortbay.com)
 
@@ -47,18 +39,10 @@ This product includes/uses the Eclipse Modeling Framework project (http://www.ec
 
 This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
 
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
-This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
+This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)
 
 This product includes/uses JDOM (http://www.jdom.org/)
  Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
- 
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
- 
-This product includes/uses dojotoolkit (http://dojotoolkit.org/)
- Copyright (c) 2005, The Dojo Foundation. All rights reserved.
 
 This product includes/uses Howl (http://howl.objectweb.org/)
  Copyright (c) 2004, Bull S.A.
@@ -69,6 +53,12 @@ This product includes/uses axion (http://axion.tigris.org/)
 This product includes/uses javacc (https://javacc.dev.java.net/)
  Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
 
+This product includes/uses ASM (http://asm.objectweb.org)

+   Copyright (c) 2000-2005 INRIA, France Telecom. All rights reserved.

+

+This product includes/uses Jaxen (http://jaxen.codehaus.org/)

+   Copyright 2003-2006 The Werken Company. All Rights Reserved.
+
 The Program includes all or portions of the following software: "The 
 Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
 an MPL v1.0 license. Please refer to the homepage URL at 
@@ -81,6 +71,13 @@ This product also includes software under the BSD license
 with the following copyright:
  Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
 
+This product also includes "OSGi Materials."
+ Copyright (c) 2000, 2006
+ OSGi Alliance Bishop Ranch 6
+ 2400 Camino Ramon, Suite 375
+ San Ramon, CA 94583 USA
+ All Rights Reserved. 
+
 This product includes software under the Service Component Architecture JavaDoc, 
 Interface Definition files and XSD files license.
   (c) Copyright SCA Collaboration 2006, 2007
diff --git a/java/sca/distribution/all/src/main/release/src/BUILDING b/java/sca/distribution/all/src/main/release/src/BUILDING
index 65d09c5eae..c61e4f76c9 100644
--- a/java/sca/distribution/all/src/main/release/src/BUILDING
+++ b/java/sca/distribution/all/src/main/release/src/BUILDING
@@ -1,4 +1,4 @@
-Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
+Building the Apache Tuscany SCA 2.0-M1 February 2009 Release source distribution
 =======================================================================================
 
 Initial Setup
diff --git a/java/sca/distribution/all/src/main/release/src/NOTICE b/java/sca/distribution/all/src/main/release/src/NOTICE
index 31540fd607..f3d8ddc5b8 100644
--- a/java/sca/distribution/all/src/main/release/src/NOTICE
+++ b/java/sca/distribution/all/src/main/release/src/NOTICE
@@ -4,10 +4,6 @@ Copyright (c) 2005 - 2009 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-
 This product also includes software under the BSD license 
 (see the LICENSE file contained in this distribution), with
 the following copyright: