Copy trunk to beta2 release branch. (I've not yet changed the version…

… so that would need to be done first before the branch is used) git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/branches/2.0-Beta2@1069272 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 10, 2011 · 58c7290 · 58c7290
2 parents da990bf + 38b341d
commit 58c7290
Show file tree

Hide file tree

Showing 782 changed files with 16,591 additions and 5,713 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,16 @@
+Changes With Apache Tuscany SCA 2.0-Beta2 January 2010
+======================================================
+
+Highlights include:
+- Addition of an interactive Shell to work with SCA domains, contributions, and services
+- More reorganization of modules to support base-runtime and extension runtime jars
+- Tidying and simplification of the Web Services binding dependencies 
+- Upgrade to Axis2 1.5.3, Axiom 1.2.10, Abdera 1.1.1 and Jackson 1.6.2 
+- Improve jaxb/json databindings and jsonrpc binding to better handle interfaces
+- Update to latest OASIS XSDs
+- quite a few changes in the async area
+
+
 Changes With Apache Tuscany SCA 2.0-Beta1 November 2010
 =======================================================
 

diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache Tuscany
-Copyright (c) 2005 - 2010 The Apache Software Foundation
+Copyright (c) 2005 - 2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,5 +1,5 @@
-Apache Tuscany SCA 2.0-Beta1 June 2010 Release Notes
-=====================================================
+Apache Tuscany SCA 2.0-Beta2 January 2010 Release Notes
+=======================================================
 
 Apache Tuscany provides a runtime based on the Service Component
 Architecture. SCA is a set of specifications aimed at simplifying SOA
@@ -9,7 +9,7 @@ of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.or
 Overview
 --------
 
-The Apache Tuscany SCA 2.0-Beta1 release includes implementations of the
+The Apache Tuscany SCA 2.0-Beta2 release includes implementations of the
 main SCA specifications and recent updates from Open CSA drafts including:
 
         * SCA Assembly Model V1.1 
@@ -39,7 +39,7 @@ yet defined by SCA specifications, including:
 
 The Tuscany SCA Runtime can be configured as a single node SCA domain.
 
-For this Beta1 release the remote Domain support is disabled pending 
+For this Beta2 release the remote Domain support is disabled pending 
 some up-coming changes in the way that domains are addressed and accessed. 
 This means that the scaclient-* samples don't work and cross JVM applications 
 that rely on binding-sca won't work. 

diff --git a/distribution/aggregations/base-runtime-aggregation/pom.xml b/distribution/aggregations/base-runtime-aggregation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-Beta2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -31,7 +31,7 @@
     <name>Apache Tuscany SCA Base Runtime Aggregation</name>
 
     <properties>
-      <bundle-symbolic-name>${project.groupId}.${artifactId}</bundle-symbolic-name>
+      <bundle-symbolic-name>${project.groupId}.${project.artifactId}</bundle-symbolic-name>
     </properties>
 
 
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>pom</type>
             <optional>true</optional>
             <exclusions>

diff --git a/distribution/aggregations/base-runtime-aggregation/src/main/resources/NOTICE b/distribution/aggregations/base-runtime-aggregation/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
 Apache Tuscany Base Jar
-Copyright (c) 2010 The Apache Software Foundation
+Copyright (c) 2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/distribution/aggregations/base-runtime-nodep/pom.xml b/distribution/aggregations/base-runtime-nodep/pom.xml
@@ -22,8 +22,8 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-Beta2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.tuscany.sca</groupId>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>jline</groupId>

diff --git a/distribution/aggregations/base-runtime-nodep/src/main/resources/NOTICE b/distribution/aggregations/base-runtime-nodep/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
 Apache Tuscany Base Jar
-Copyright (c) 2010 The Apache Software Foundation
+Copyright (c) 2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml b/distribution/aggregations/binding-rmi-runtime-aggregation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-Beta2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi-runtime</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

diff --git a/distribution/aggregations/binding-rmi-runtime-aggregation/src/main/resources/NOTICE b/distribution/aggregations/binding-rmi-runtime-aggregation/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
 Apache Tuscany Base Jar
-Copyright (c) 2010 The Apache Software Foundation
+Copyright (c) 2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml b/distribution/aggregations/binding-ws-runtime-axis2-aggregation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-Beta2-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

diff --git a/distribution/aggregations/binding-ws-runtime-axis2-aggregation/src/main/resources/NOTICE b/distribution/aggregations/binding-ws-runtime-axis2-aggregation/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
 Apache Tuscany Base Jar
-Copyright (c) 2010 The Apache Software Foundation
+Copyright (c) 2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).