8 files changed, 12 insertions, 108 deletions
diff --git a/cpp/build.bat b/cpp/build.bat
deleted file mode 100644
index 719cae8d8f..0000000000
--- a/cpp/build.bat
+++ /dev/null
@@ -1,49 +0,0 @@
-@echo off
-@REM  Licensed to the Apache Software Foundation (ASF) under one
-@REM  or more contributor license agreements.  See the NOTICE file
-@REM  distributed with this work for additional information
-@REM  regarding copyright ownership.  The ASF licenses this file
-@REM  to you under the Apache License, Version 2.0 (the
-@REM  "License"); you may not use this file except in compliance
-@REM  with the License.  You may obtain a copy of the License at
-@REM  
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM    
-@REM  Unless required by applicable law or agreed to in writing,
-@REM  software distributed under the License is distributed on an
-@REM  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM  KIND, either express or implied.  See the License for the
-@REM  specific language governing permissions and limitations
-@REM  under the License.
-
-
-@setlocal
-
-set config=Release
-if .Debug == .%1 (
-echo Building Debug version
-set config=Debug
-)
-
-if "%LIBXML2_HOME%" == "" (
-echo "LIBXML2_HOME not set"
-goto end
-)
-
-if "%ICONV_HOME%" == "" (
-echo "ICONV_HOME not set"
-goto end
-)
-
-if "%AXIS2C_HOME%" == "" (
-echo "AXIS2C_HOME not set"
-goto end
-)
-
-cd sdo
-call build.bat
-
-cd ..\sca
-call build.bat
-
-@endlocal
diff --git a/cpp/build.sh b/cpp/build.sh
deleted file mode 100755
index da485555d9..0000000000
--- a/cpp/build.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-#  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.
-
-TOPDIR=`pwd`
-
-# Build SDO
-cd sdo
-./build.sh
-cd $TOPDIR
-
-# Build SCA
-cd sca
-./build.sh
-cd $TOPDIR
-
diff --git a/java/sca/shades/base/pom.xml b/java/sca/shades/base/pom.xml
index 4cb28c5f29..0e9e451ff6 100644
--- a/java/sca/shades/base/pom.xml
+++ b/java/sca/shades/base/pom.xml
@@ -63,6 +63,16 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-sca-client-javascript</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-sca-client-rmi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
             <version>${pom.version}</version>
             <exclusions>
diff --git a/cpp/BUILDING b/sdo-cpp/trunk/BUILDING
index e0923251e8..bfb87e7028 100644
--- a/cpp/BUILDING
+++ b/sdo-cpp/trunk/BUILDING
@@ -18,12 +18,11 @@ Environment:
 
 
 Build:
-- cd <tuscany_cpp_root>
+- cd <tuscany_cpp_root>/sdo
 - ./build.sh
 
-This first builds the SDO subproject then SCA. The results are installed in
+This builds the SDO subproject then SCA. The results are installed in
  <tuscany_cpp_root>/sdo/deploy
- <tuscany_cpp_root>/sca/deploy
 
 SDO Test
 --------
@@ -33,13 +32,6 @@ Run:
 - ./sdotest.sh
 
 
-SCA Test
---------
-
-Run:
-- cd <tuscany_cpp_root>/sca
-- ./scatest.sh
-
 Linux distribution build
 ========================
 To build the distro zips for linux:
@@ -57,15 +49,6 @@ The download location is <tuscany_cpp_root>
 4. ./builddist.sh
    This produces a src and bin zip for Tuscany SDO
 
-5. cd <tuscany_cpp_root>/sca
-
-6. set the environment
-   - export TUSCANY_SDOCPP=<tuscany_cpp_root>/sdo/tucany_sdo-bin-${PACKAGE-VERSION}
-   
-7. ./builddist.sh
-   This produces a src and bin zip for Tuscany SCA
-   
-
 Windows Build
 =============
 
@@ -88,12 +71,3 @@ Prereqs:
 
 3. .\build.bat
 
-
-SCA
----
-
-1. Set the environment variable TUSCANY_SDOCPP to the path of an SDO build
-
-2. cd <tuscany_cpp_root>\sca
-
-3. .\build.bat
diff --git a/cpp/etc/addLicense2cpp.pl b/sdo-cpp/trunk/etc/addLicense2cpp.pl
index 668b2c943d..668b2c943d 100644
--- a/cpp/etc/addLicense2cpp.pl
+++ b/sdo-cpp/trunk/etc/addLicense2cpp.pl
diff --git a/cpp/etc/addLicense2cppheader.pl b/sdo-cpp/trunk/etc/addLicense2cppheader.pl
index 4e347605f6..4e347605f6 100644
--- a/cpp/etc/addLicense2cppheader.pl
+++ b/sdo-cpp/trunk/etc/addLicense2cppheader.pl
diff --git a/cpp/etc/svn-config b/sdo-cpp/trunk/etc/svn-config
index 4f8cb41685..4f8cb41685 100644
--- a/cpp/etc/svn-config
+++ b/sdo-cpp/trunk/etc/svn-config
diff --git a/cpp/etc/svn-ignore b/sdo-cpp/trunk/etc/svn-ignore
index cf9bd507e4..cf9bd507e4 100644
--- a/cpp/etc/svn-ignore
+++ b/sdo-cpp/trunk/etc/svn-ignore