Fixes for TUSCANY-2699

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

6 files changed, 124 insertions, 79 deletions

diff --git a/branches/sca-java-1.x/distribution/src/main/assembly/bin.xml b/branches/sca-java-1.x/distribution/src/main/assembly/bin.xml
index 3cfdaeb778..7d93996640 100644
--- a/branches/sca-java-1.x/distribution/src/main/assembly/bin.xml
+++ b/branches/sca-java-1.x/distribution/src/main/assembly/bin.xml
@@ -96,10 +96,6 @@
                 <exclude>*/**/*.svg</exclude>
                 <!-- Sample specific work file/folders to exclude -->
                 <exclude>pom.xml</exclude>
-                <exclude>calculator2</exclude>
-                <exclude>calculator2/**/*</exclude>
-                <exclude>calculator-rcp</exclude>
-                <exclude>calculator-rcp/**/*</exclude>
                 <exclude>calculator-distributed/work</exclude>
                 <exclude>calculator-distributed/work/**/*</exclude>
                 <exclude>calculator-webapp/target/sample-calculator-webapp</exclude>
@@ -113,16 +109,12 @@
                 <exclude>callback-ws-client/work/**/*</exclude>
                 <exclude>callback-ws-service/work</exclude>
                 <exclude>callback-ws-service/work/**/*</exclude>
-                <exclude>chat2-webapp</exclude>
-                <exclude>chat2-webapp/**/*</exclude>
                 <exclude>chat-webapp/target/sample-chat-webapp</exclude>
                 <exclude>chat-webapp/target/sample-chat-webapp/**/*</exclude>
                 <exclude>customer-dojo-webapp/src/main/webapp/dojo</exclude>
                 <exclude>customer-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
                 <exclude>customer-dojo-webapp/target/</exclude>
                 <exclude>customer-dojo-webapp/target/**/*</exclude>
-                <exclude>domain-webapp</exclude>
-                <exclude>domain-webapp/**/*</exclude>
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
                 <exclude>feed-aggregator-webapp/target/war</exclude>
@@ -133,23 +125,14 @@
                 <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
                 <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp/**/*</exclude>
                 <exclude>helloworld-dojo-webapp/target/war</exclude>
-                <exclude>helloworld-jms-webapp</exclude>
-                <exclude>helloworld-jms-webapp/**/*</exclude>
-                <exclude>helloworld-jms-webapp/work</exclude>
                 <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp</exclude>
                 <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp/**/*</exclude>
-                <exclude>helloworld-ws-deep-webapp</exclude>
-                <exclude>helloworld-ws-deep-webapp/**/*</exclude>
-                <exclude>helloworld-ws-deep-webapp/work</exclude>
-                <exclude>helloworld-ws-deep-webapp/work/**/*</exclude>
                 <exclude>helloworld-ws-reference/work</exclude>
                 <exclude>helloworld-ws-reference/work/**/*</exclude>
                 <exclude>helloworld-ws-reference-jms/activemq-data</exclude>
                 <exclude>helloworld-ws-reference-jms/activemq-data/**/*</exclude>
                 <exclude>helloworld-ws-reference-secure/work</exclude>
                 <exclude>helloworld-ws-reference-secure/work/**/*</exclude>
-                <exclude>helloworld-ws-service-webapp</exclude>
-                <exclude>helloworld-ws-service-webapp/**/*</exclude>
                 <exclude>helloworld-ws-service/work</exclude>
                 <exclude>helloworld-ws-service/secure/work/**/*</exclude>
                 <exclude>helloworld-ws-service/secure/work</exclude>
@@ -164,8 +147,6 @@
                 <exclude>helloworld-ws-sdo/work/**/*</exclude>
                 <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp</exclude>
                 <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp/**/*</exclude>
-                <exclude>loanapplication</exclude>
-                <exclude>loanapplication/**/*</exclude>
                 <exclude>osgi-supplychain/.felix</exclude>
                 <exclude>osgi-supplychain/.felix/**/*</exclude>
                 <exclude>osgi-supplychain/target/sample-osgi-supplychain</exclude>
@@ -176,8 +157,6 @@
                 <exclude>simple-callback-ws/work/**/*</exclude>
                 <exclude>zipcode-jaxws/target/endorsed</exclude>
                 <exclude>zipcode-jaxws/target/endorsed/**/*</exclude>
-                <exclude>spi-implementation-pojo</exclude>
-                <exclude>spi-implementation-pojo/**/*</exclude>
                 <!-- Sample war files to exclude -->
                 <exclude>calculator-ws-secure-webapp/target/sample-calculator-ws-secure-webapp.war</exclude>
                 <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp.war</exclude>
@@ -190,6 +169,55 @@
                 <exclude>helloworld-ws-deep-webapp/target/sample-helloworld-ws-deep-webapp.war</exclude>
                 <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp.war</exclude>
                 <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp.war</exclude>
+                <!-- Modules excluded from distribution as work is in progress... -->
+                <exclude>calculator2</exclude>
+                <exclude>calculator2/**/*</exclude>
+                <exclude>calculator-corba-reference</exclude>
+                <exclude>calculator-corba-reference/**/*</exclude>
+                <exclude>calculator-corba-service</exclude>
+                <exclude>calculator-corba-service/**/*</exclude>
+                <exclude>calculator-lean</exclude>
+                <exclude>calculator-lean/**/*</exclude>
+                <exclude>calculator-osgi</exclude>
+                <exclude>calculator-osgi/**/*</exclude>
+                <exclude>calculator-rcp</exclude>
+                <exclude>calculator-rcp/**/*</exclude>
+                <exclude>chat2-webapp</exclude>
+                <exclude>chat2-webapp/**/*</exclude>
+                <exclude>customer-dojo</exclude>
+                <exclude>customer-dojo/**/*</exclude>
+                <exclude>customer-dojo-webapp</exclude>
+                <exclude>customer-dojo-webapp/**/*</exclude>
+                <exclude>helloworld-distributed</exclude>
+                <exclude>helloworld-distributed/**/*</exclude>
+                <exclude>helloworld-jsp</exclude>
+                <exclude>helloworld-jsp/**/*</exclude>
+                <exclude>helloworld-servlet</exclude>
+                <exclude>helloworld-servlet/**/*</exclude>
+                <exclude>helloworld-web</exclude>
+                <exclude>helloworld-web/**/*</exclude>
+                <exclude>helloworld-web-callback</exclude>
+                <exclude>helloworld-web-callback/**/*</exclude>
+                <exclude>loanapplication</exclude>
+                <exclude>loanapplication/**/*</exclude>
+                <exclude>helloworld-ws-reference-lean</exclude>
+                <exclude>helloworld-ws-reference-lean/**/*</exclude>
+                <exclude>spi-implementation-pojo</exclude>
+                <exclude>spi-implementation-pojo/**/*</exclude>
+		    <exclude>helloworld-jms-webapp</exclude>
+                <exclude>helloworld-jms-webapp/**/*</exclude>
+                <exclude>helloworld-jms-webapp/work</exclude>
+                <exclude>domain-webapp</exclude>
+                <exclude>domain-webapp/**/*</exclude>
+                <exclude>calculator-ws-secure-webapp</exclude>
+                <exclude>calculator-ws-secure-webapp/**/*</exclude>
+                <exclude>calculator-ws-secure-webapp/work</exclude>
+                <exclude>helloworld-ws-deep-webapp</exclude>
+                <exclude>helloworld-ws-deep-webapp/**/*</exclude>
+                <exclude>helloworld-ws-deep-webapp/work</exclude>
+                <exclude>helloworld-ws-deep-webapp/work/**/*</exclude>
+                <exclude>helloworld-ws-service-webapp</exclude>
+                <exclude>helloworld-ws-service-webapp/**/*</exclude>
             </excludes>
         </fileSet>
         <!-- Add all the demos to the demos directory -->
@@ -259,6 +287,11 @@
                 <exclude>xml-bigbank/target/**/*</exclude>
                 <exclude>target</exclude>
                 <exclude>target/**/*</exclude>
+                <!-- Modules excluded from distribution as work is in progress... -->
+		    <exclude>load-balancing-webapp</exclude>
+		    <exclude>load-balancing-webapp/**/*</exclude>
+                <exclude>workpool-distributed</exclude>
+                <exclude>workpool-distributed/**/*</exclude>
             </excludes>
         </fileSet>
         <!-- Add all the tutorials to the tutorials directory -->
diff --git a/branches/sca-java-1.x/distribution/src/main/release/README b/branches/sca-java-1.x/distribution/src/main/release/README
index d1146a0391..6a6050294b 100644
--- a/branches/sca-java-1.x/distribution/src/main/release/README
+++ b/branches/sca-java-1.x/distribution/src/main/release/README
@@ -1,4 +1,4 @@
-Apache Tuscany SCA 1.4 November 2008 README
+Apache Tuscany SCA 1.4 December 2008 README
 =====================================================
 
 Welcome to the Tuscany SCA 1.4 release. 
diff --git a/branches/sca-java-1.x/distribution/src/main/release/RELEASE_NOTES b/branches/sca-java-1.x/distribution/src/main/release/RELEASE_NOTES
index f8fc6b7880..ba2754c9c2 100644
--- a/branches/sca-java-1.x/distribution/src/main/release/RELEASE_NOTES
+++ b/branches/sca-java-1.x/distribution/src/main/release/RELEASE_NOTES
@@ -1,4 +1,4 @@
-Apache Tuscany SCA 1.4 November 2008 Release Notes
+Apache Tuscany SCA 1.4 December 2008 Release Notes
 ============================================================
 
 Apache Tuscany provides a runtime based on the Service Component
diff --git a/branches/sca-java-1.x/distribution/src/main/release/bin/INSTALL b/branches/sca-java-1.x/distribution/src/main/release/bin/INSTALL
index 44b3ff6444..a587ad802f 100644
--- a/branches/sca-java-1.x/distribution/src/main/release/bin/INSTALL
+++ b/branches/sca-java-1.x/distribution/src/main/release/bin/INSTALL
@@ -1,9 +1,9 @@
-Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
+Installing the Apache Tuscany SCA 1.4 December 2008 Release binary distribution
 =========================================================================================
 
 Unzip Tuscany binary distribution archive and you get the following:
 
-tuscany-sca-1.1-incubating        
+tuscany-sca-1.4        
    INSTALL       - this help file
    LICENSE       - the Apache License and any dependecy licenses
    NOTICE        - attribution notices associated with the licenses
diff --git a/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE
index 7ea8d871a2..f26c3ce342 100644
--- a/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE
+++ b/branches/sca-java-1.x/distribution/src/main/release/bin/LICENSE
@@ -220,33 +220,43 @@ The following components come under Apache Software License 1.1
 
 The following components come under Apache Software License 2.0
 
- abdera-core-0.3.0-incubating.jar
- abdera-i18n-0.3.0-incubating.jar
- abdera-parser-0.3.0-incubating.jar
+ abdera-client-0.4.0-incubating.jar
+ abdera-core-0.4.0-incubating.jar
+ abdera-extensions-html-0.4.0-incubating.jar
+ abdera-extensions-json-0.4.0-incubating.jar
+ abdera-extensions-main-0.4.0-incubating.jar
+ abdera-i18n-0.4.0-incubating.jar
+ abdera-parser-0.4.0-incubating.jar
+ abdera-server-0.4.0-incubating.jar
  activeio-2.0-r118.jar
  activeio-core-3.0.0-incubator.jar
+ activeio-core-3.1.0-tests.jar
+ activemq-core-5.1.0.jar
  apache-activemq-4.1.1.jar
  addressing-1.3.mar
  annogen-0.1.0.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
+ 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-java2wsdl-1.4.1.jar
+ axis2-kernel-1.4.1.jar
+ axis2-mtompolicy-1.4.1.jar
+ bcel-5.2.jar
  bsf-all-3.0-beta2.jar
+ camel-core-1.3.0.jar
  cglib-nodep-2.1_3.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-fileupload-1.2.jar
+ commons-httpclient-3.1.jar
+ commons-io-1.4.jar
  commons-jexl-1.1.jar
  commons-lang-2.1.jar
- commons-logging-1.1.jar
+ commons-logging-1.1.1.jar
+ commons-logging-api-1.1.jar
  derby-10.3.1.4.jar
  geronimo-common-1.2-beta.jar
  geronimo-commonj_1.1_spec-1.0.jar
@@ -258,8 +268,8 @@ The following components come under Apache Software License 2.0
  geronimo-j2ee-1.2-beta.jar
  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-j2ee-management_1.0_spec-1.0.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-jta_1.0.1B_spec-1.0.jar
@@ -269,33 +279,34 @@ 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-niossl-4.0-alpha5.jar
- jettison-1.0.jar
+ httpcore-4.0-beta1.jar
+ httpcore-nio-4.0-beta1.jar
+ httpcore-niossl-4.0-beta1.jar
+ jettison-1.0.1.jar
  jetty-6.1.7.jar
  jetty-util-6.1.7.jar
  json-rpc-1.0.jar
  log4j-1.2.12.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
+ neethi-2.0.4.jar
+ ode-bpel-api-1.1.1.jar
+ ode-bpel-compiler-1.1.1.jar
+ ode-bpel-dao-1.1.1.jar
+ ode-bpel-epr-1.1.1.jar
+ ode-bpel-obj-1.1.1.jar
+ ode-bpel-runtime-1.1.1.jar
+ ode-bpel-schemas-1.1.1.jar
+ ode-bpel-store-1.1.1.jar
+ ode-dao-jpa-1.1.1.jar
+ ode-dao-jpa-ojpa-derby-1.1.1.zip
+ ode-jacob-1.1.1.jar
+ ode-jacob-ap-1.1.1.jar
+ ode-scheduler-simple-1.1.1.jar
+ ode-utils-1.1.1.jar
  openjpa-all-0.9.7-incubating.jar
  openjpa-persistence-0.9.7-incubating.jar
  org.apache.felix.bundlerepository-1.0.3.jar
@@ -303,28 +314,29 @@ The following components come under Apache Software License 2.0
  org.apache.felix.main-1.0.4.jar
  org.apache.felix.shell-1.0.1.jar
  org.apache.felix.shell.tui-1.0.1.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.8.jar
- spring-context-2.0.8.jar
- spring-core-2.0.8.jar
+ spring-beans-2.5.5.jar
+ spring-context-2.5.5.jar
+ spring-core-2.5.5.jar
  tranql-connector-1.1.jar
- tuscany-sdo-api-r2.1-1.1-incubating.jar
- tuscany-sdo-impl-1.1-incubating.jar
- tuscany-sdo-lib-1.1-incubating.jar
- tuscany-sdo-tools-1.1-incubating.jar
- woden-1.0-incubating-M7b.jar
- wss4j-1.5.3.jar
- wstx-asl-3.2.1.jar
+ tuscany-sdo-api-r2.1-1.1.1.jar
+ tuscany-sdo-impl-1.1.1.jar
+ tuscany-sdo-lib-1.1.1.jar
+ tuscany-sdo-tools-1.1.1.jar
+ woden-api-1.0M8.jar
+ woden-impl-dom-1.0M8.jar
+ wss4j-1.6.2.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
  xml-resolver-1.1.jar
- xmlsec-1.4.0.jar
+ xmlsec-1.4.2.jar
  XmlSchema-1.3.2.jar
 
 ===============================================================================
@@ -1967,7 +1979,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
 
 ===============================================================================
 
-backport-util-concurrent-3.0.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.
@@ -2143,7 +2155,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================================
 
-The module tuscany-implementation-script-1.0-incubating.jar temporarily includes    
+The module tuscany-implementation-script-1.4.jar temporarily includes    
 one file under the below BSD license with the following copyright:
 
  Copyright (c) 2006, Sun Microsystems, Inc.
@@ -2292,7 +2304,7 @@ 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.1-incubating.jar)
+License for the Service Data Objects JavaDoc and Interface Definition files. (tuscany-sdo-api-r2.1-1.1.1.jar)
 
 These files being ...
 commonj/sdo/ChangeSummary$Setting.class
diff --git a/branches/sca-java-1.x/distribution/src/main/release/src/BUILDING b/branches/sca-java-1.x/distribution/src/main/release/src/BUILDING
index 65d09c5eae..53bca7807c 100644
--- a/branches/sca-java-1.x/distribution/src/main/release/src/BUILDING
+++ b/branches/sca-java-1.x/distribution/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 1.4 December 2008 Release source distribution
 =======================================================================================
 
 Initial Setup