Cleaned up old out of sync build artifacts.

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

50 files changed, 0 insertions, 8710 deletions

diff --git a/cpp/sca/ChangeLog b/cpp/sca/ChangeLog
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cpp/sca/ChangeLog
+++ /dev/null
diff --git a/cpp/sca/README_ANT_INSTALL b/cpp/sca/README_ANT_INSTALL
deleted file mode 100644
index 2abb21e6ab..0000000000
--- a/cpp/sca/README_ANT_INSTALL
+++ /dev/null
@@ -1,360 +0,0 @@
-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.

-

-Using ant to build TuscanySCA Native

-

-This guide shows how to build TuscanySCA Native with apache ant. 

-Traditionally TuscanySCA was compiled with automake, but we decided

-it would be easier to maintain and more flexible if we switched to 

-ant. Above all, using ant will standardize the build system across 

-all platforms, obviating the need to support both automake and 

-microsoft VC projects.The ant build process is still in its beta 

-and will be formalized for Release M4. Currently the only item 

-remaining is to finish writing ant build files for the rest of the 

-samples.

-

-

-Required Software to build TuscanySCA Native with ant

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

-

-Java:

-        Most Linux, Mac, and Windows systems come with Java

-        Java 1.4.2 or later

-

-Ant:

-        Ant comes installed with almost all Linux distributions

-        version 1.6 or later

-        Download: http://ant.apache.org/

-

-antcontrib:

-        version 1.0b3 or later

-        Download: http://ant-contrib.sourceforge.net/

-

-antcontrib cpptasks.jar

-        version 1.0b4 or later

-        Download: http://ant-contrib.sourceforge.net/

-        Information: http://ant-contrib.sourceforge.net/cc.html

-

-

-Installation Instructions

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

-

-Linux/Mac

----------

-

-Make sure JAVA_HOME is set before starting.

-

-Install ant according to http://ant.apache.org/manual/index.html.

-

-Set the ANT_HOME variable to the directory where you install ant.

-export ANT_HOME="/home/your/ant"

-

-Add $ANT_HOME/bin to your path.

-export PATH="${PATH}:${ANT_HOME}/bin"

-

-The optional ant tasks included in antcontrib and cpptasks are needed to

-compile Tuscany Native with ant. Additional ant tasks (antcontrib and cpptasks)

-should be installed in $ANT_HOME/lib

-So place the antcontrib and cpptasks jars there.

-

-If you dont have write access to $ANT_HOME/lib, do the following:

-- create ${user.home}/.ant/lib

-- place the jars here

-

-Typically its a good idea to avoid adding optional ant tasks to your classpath,

-this can be problematic.

-

-Since the antcontrib compiler adaptor for microsoft msvc 8 has several bugs, we've

-written our own. Even though this compiler is for Windows, it is referenced in the

-ant build scripts and thus needs to be added to the classpath even for Linux/Mac.

-Add the TuscanyMSVC8DevStudioCCompiler jar to your classpath.

-export CLASSPATH="${CLASSPATH}:/TuscanySourceDir/antscripts/TuscanyMSVC8DevStudioCCompiler.jar"

-

-Windows

--------

-

-Make sure JAVA_HOME is set before starting.

-

-Install ant according to http://ant.apache.org/manual/index.html.

-

-Set the ANT_HOME variable to the directory where you install ant.

-set ANT_HOME=c:\ant

-

-Add %ANT_HOME%\bin to your path.

-set PATH=%PATH%;%ANT_HOME%\bin

-

-The optional ant tasks included in antcontrib and cpptasks are needed to

-compile Tuscany Native with ant. Additional ant tasks (antcontrib and cpptasks)

-should be installed in %ANT_HOME%\lib

-So place the antcontrib and cpptasks jars there.

-

-If you dont have write access to %ANT_HOME%\lib, do the following:

-- create %user.home%\.ant\lib

-- place the jars here

-

-Typically its a good idea to avoid adding optional ant tasks to your classpath,

-this can be problematic.

-

-Since the antcontrib compiler adaptor for microsoft msvc 8 has several bugs, we've

-written our own, namely TuscanyMSVC8DevStudioCCompiler. The Tuscany MSVC8 adaptor 

-just makes sure that the correct parameters are passed to the compiler.

-Add the TuscanyMSVC8DevStudioCCompiler jar to your classpath.

-set CLASSPATH=%CLASSPATH%:c:\TuscanySourceDir\antscripts\TuscanyMSVC8DevStudioCCompiler.jar

-

-USAGE

-=====

-

-From the TuscanySCA Native root source directory, the entire application can be 

-compiled, linked, and installed by simply executing ant with no targets. This will

-execute the default "all" target.

-

-# ant

-

-The ant build system will scan your environment variables and ant configuration file

-and try to autoconfigure everything needed to build.  The environment variables can be 

-overridden by the ant configuration file: antscripts/platform.properties.  The only 

-configuration that is mandatory to build TuscanySCA Native is the location of an SDO 

-implementation, typically TuscanySDO Native.

-

-To configure the location of TuscanySDO Native, do one of the following:

-export TUSCANY_SDOCPP=/tuscany/sdo/native/deploy/dir

-  -- OR --

-edit antscripts/platform.properties

-platform.tuscanySDO.install.dir=/tuscany/sdo/native/deploy/dir

-

-The platform.properties configuration always overrides environment variables.

-See the CONFIGURATION section below for more information.

-

-To compile in debug mode, add the following define to the ant command line or

-edit the platform.properties file as seen in the CONFIGURATION section below.

-

-# ant -Ddebug=true

-

-The TuscanySCA Native ant build process is hierarchical. Currently there are 

-build scripts in the following locations, which can all be invoked from the 

-root TuscanySCA directory:

-  TUSCANY_SCA_SRC_ROOT/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/core/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/cpp/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/php/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/cpp/tools/scagen/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/python/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/rest/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/ruby/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/sca/build.xml

-  TUSCANY_SCA_SRC_ROOT/runtime/extensions/wsbuild.xml

-  TUSCANY_SCA_SRC_ROOT/tools/TuscanyDriver/build.xml

-  TUSCANY_SCA_SRC_ROOT/tools/TuscanyDriver/build.xml

-  TUSCANY_SCA_SRC_ROOT/samples/CppBigBank/build.xml (the rest of the samples are coming soon)

-

-For a listing of public targets for any build.xml file, execute the following: 

-(display shown for the root src directory)

-

-# ant -p

-Buildfile: build.xml

-

-Main targets:

-

- all      build and install all TuscanyScaNative source code

- build    Build all TuscanyScaNative source code

- clean    Clean all TuscanyScaNative compiled source code

- install  Install TuscanyScaNative libraries and headers

-Default target: all

-

-Public targets are those that have descriptions and are usually the only ones needed for

-compiling, installing and cleaning. For more avanced use, the private targets can be seen 

-by looking at the actual build.xml file.

-

-

-CONFIGURATION

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

-

-The following explains how to configure the TuscanySCA Native ant build system.

-The build system is configured either by environment variables and/or by the

-antscripts/platform.properties file. Some options can only be configured via the

-platform.properties file. If an option can be configured in both places, the option

-specified in the platform.properties file overrides the environment variable.

-

-The TuscanySCA Native ant build system is capable of automatically configuring 

-everything except the location of the Tuscany SDO Native location. All other

-configuration options can be determined. (except of course the location of the 

-optional 3rd-party packages: axis2c, python, php, ruby, and rest) 

-

-From anywhere there is a TuscanySCA Native build.xml file, the current system

-configuration can be displayed by executing the display.system ant target as 

-follows:

-

-# ant display.system

-Buildfile: build.xml

-

-check.ws:

-

-check.python:

-

-check.php:

-

-check.ruby:

-

-check.rest:

-

-display.system:

-     [echo]

-     [echo] TuscanySCA paths

-     [echo]   tuscanySCA.install.dir=      /nfs/homes/bjohnson/tuscany_svn_head/sca/deploy

-     [echo]   tuscanySCA.root.dir=         /amd/homes/bjohnson/tuscany_svn_head/sca

-     [echo]   tuscanySCA.root.src.dir=     /amd/homes/bjohnson/tuscany_svn_head/sca/runtime

-     [echo]   tuscanySCA.install.dir=      /nfs/homes/bjohnson/tuscany_svn_head/sca/deploy

-     [echo]   tuscanySCA.library.version=  '.0.0.0'

-     [echo]   tuscanySDO.install.dir=      /nfs/homes/bjohnson/tuscany_svn_head/sdo/deploy

-     [echo]

-     [echo] TuscanySCA compiler configuration

-     [echo]   compiler.name=               'g++'

-     [echo]   debug.compile=               'false'

-     [echo]   lib.ext=                     '.so'

-     [echo]   dll.ext=                     ''

-     [echo]   lib.prefix=                  'lib'

-     [echo]   object.ext=                  '.o'

-     [echo]   exe.ext=                     ''

-     [echo]   script.ext=                  '.sh'

-     [echo]   external.definitions.file=   ''

-     [echo]   sdo.impl.library.name=       'tuscany_sdo'

-     [echo]

-     [echo] TuscanySCA ws extension enabled

-     [echo]   axis2c.home.dir=          /nfs/homes/bjohnson/3rdparty/axis2c-src-0.96/deploy

-     [echo]

-     [echo] TuscanySCA php extension enabled

-     [echo]   php.lib.dir=              /nfs/homes/bjohnson/3rdparty/php-5.1.6/deploy/lib

-     [echo]   php.include.dir=          /nfs/homes/bjohnson/3rdparty/php-5.1.6/deploy/include/php

-     [echo]   php.sca.sdo.lib.dir=      /nfs/homes/bjohnson/3rdparty/sdo-1.0.3/lib

-     [echo]   php.sca.sdo.include.dir=  /nfs/homes/bjohnson/3rdparty/sdo-1.0.3

-     [echo]

-     [echo] TuscanySCA python extension enabled

-     [echo]   python.lib.dir=           /nfs/homes/bjohnson/3rdparty/Python-2.5.1/deploy/lib

-     [echo]   python.include.dir=       /nfs/homes/bjohnson/3rdparty/Python-2.5.1/deploy/include/python2.5

-     [echo]   python.version=           python2.5

-     [echo]

-     [echo] TuscanySCA rest extension enabled

-     [echo]   rest.curl.lib.dir=        /usr/lib

-     [echo]   rest.curl.include.dir=    /usr/include/curl

-     [echo]   rest.httpd.include.dir=   /nfs/homes/bjohnson/3rdparty/httpd-2.0.59/deploy/include

-     [echo]   rest.apr.include.dir=     /usr/include/apr-0

-     [echo]

-     [echo] TuscanySCA ruby extension enabled

-     [echo]   ruby.lib.dir=             /nfs/homes/bjohnson/3rdparty/ruby-1.8.6/deploy/lib

-     [echo]   ruby.include.dir=         /nfs/homes/bjohnson/3rdparty/ruby-1.8.6/deploy/include

-     [echo]

-

-BUILD SUCCESSFUL

-Total time: 0 seconds

-

-

-Compilation configuration

--------------------------

-

-The compilation options can all be determined by the ant build system by

-examining the platform.  The values can only be overriden by editing the 

-platform.properties file. Following is a list of the options and their 

-default values:

-

-platform.lib.ext=        (Defaults to ".so" for Unix and ".lib" for Windows)

-platform.dll.ext=        (Defaults to "" for Unix and ".dll" for Windows. Not used for Unix)

-platform.exe.ext=        (Defaults to "" for Unix and ".exe" for Windows)

-platform.object.ext=     (Defaults to ".o" for Unix and ".obj" for Windows)

-platform.script.ext=     (Defaults to ".sh" for Unix and ".bat" for Windows)

-platform.compiler.name=  (Defaults to "g++" for Unix and "msvc8" for Windows)

-platform.debug.compile=  (Defaults to "false" for both Unix and Windows)

-

-To configure ant to use a compiler other than g++ or msvc, or to add your own

-ant tasks/definitions, specify a path for the platform.external.definitions.file

-and platform.compiler.name in the platform.properties configuration file. This 

-is especially useful for compiling on other platforms like AIX or Solaris.

-

-Tuscany SCA and SDO paths

--------------------------

-

-Both the Tuscany SCA and SDO installation directories can be configured as follows:

-  export TUSCANY_SCACPP=/tuscany/sca/native/install/dir

-  export TUSCANY_SDOCPP=/tuscany/sdo/native/install/dir

-  -- OR --

-  edit antscripts/platform.properties

-  platform.tuscanySCA.install.dir=/tuscany/sca/native/install/dir

-  platform.tuscanySDO.install.dir=/tuscany/sdo/native/install/dir

-

-The Tuscany SCA installation directory defaults to:

-  TUSCANY_SCA_SRC_ROOT/deploy

-

-Extension configuration

------------------------

-

-AXIS2C:

-If not specified, then the values are left empty and the cpp and ws extensions will not be compiled.

-

-  export AXIS2C_HOME=/axis2c/home/dir

-   -- OR --

-  edit antscripts/platform.properties

-  platform.axis2c.home.dir=/axis2c/home/dir

-

-PYTHON:

-If not specified, then the values are left empty and the python extension will not be compiled.

-

-  export PYTHON_LIB=/python/library/directory

-  export PYTHON_INCLUDE=/python/include/directory

-  export PYTHON_VERSION=python_library_name_with_version

-    -- OR --

-  edit antscripts/platform.properties

-  platform.python.include.dir=/python/library/directory

-  platform.python.lib.dir=/python/include/directory

-  platform.python.version=python_library_name_with_version

-

-PHP:

-If not specified, then the values are left empty and the php extension will not be compiled.

-

-  export PHP_LIB=/php/library/directory

-  export PHP_INCLUDE=/php/include/directory

-  export PHP_SCA_SDO_LIB=/php/sdo/library/directory

-  export PHP_SCA_SDO_INCLUDE=/php/sdo/include/directory

-  -- OR --

-  edit antscripts/platform.properties

-  platform.php.include.dir=/php/library/directory

-  platform.php.lib.dir=/php/include/directory

-  platform.php.sca.sdo.lib.dir=/php/sdo/library/directory

-  platform.php.sca.sdo.include.dir=/php/sdo/include/directory

-

-RUBY:

-If not specified, then the values are left empty and the ruby extension will not be compiled.

-  export RUBY_LIB=/ruby/library/directory

-  export RUBY_INCLUDE=/ruby/include/directory

-    -- OR --

-  edit antscripts/platform.properties

-  platform.ruby.lib.dir=/ruby/library/directory

-  platform.ruby.include.dir=/ruby/include/directory

-

-REST:

-If not specified, then the values are left empty and the rest extension will not be compiled.

-  export CURL_LIB=/curl/library/directory

-  export CURL_INCLUDE=/curl/include/directory

-  export HTTPD_INCLUDE=/httpd/apache/include/directory

-  export APR_INCLUDE=/apr/include/directory

-    -- OR --

-  edit antscripts/platform.properties

-  platform.rest.curl.lib.dir=/curl/library/directory

-  platform.rest.curl.include.dir=/curl/include/directory

-  platform.rest.httpd.include.dir=/httpd/apache/include/directory

-  platform.rest.apr.include.dir=/apr/include/directory

-

-

diff --git a/cpp/sca/antscripts/TuscanyMSVC8DevStudioCCompiler.jar b/cpp/sca/antscripts/TuscanyMSVC8DevStudioCCompiler.jar
deleted file mode 100644
index 9ffc08fd1f..0000000000
--- a/cpp/sca/antscripts/TuscanyMSVC8DevStudioCCompiler.jar
+++ /dev/null
diff --git a/cpp/sca/antscripts/compile-targets.xml b/cpp/sca/antscripts/compile-targets.xml
deleted file mode 100644
index f78236e159..0000000000
--- a/cpp/sca/antscripts/compile-targets.xml
+++ /dev/null
@@ -1,341 +0,0 @@
-<?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 name='compiler-targets'>
-
-  <import file="./system.xml"/>
-
-  <!--
-    Do a cpp compilation.
-    Inherits from "Tuscany-BaseCompiler", which has an include path of:
-        ${sdo.include.dir}
-        ${tuscanySCA.root.dir}
-        ${tuscanySCA.root.src.dir}
-        ${tuscanySCA.root.src.dir}/core/src
-    @param objdir - directory where the object files will be written
-    @param srcdir - directory where the source files are located.
-    @param infiles - a space seperated list of the files to compile
-    @param custom-cc-elements - any extra cpp elements, may also be extra <includepath> elements
-  -->
-  <macrodef name="cpp-compile">
-    <attribute name="objdir" default="."/>
-    <attribute name="srcdir" default="."/>
-    <attribute name="infiles" default="*.cpp"/>
-    <element name="custom-cc-elements" optional="true"/>
-    <sequential>
-      <mkdir dir='@{objdir}'/>
-      <cc subsystem='console'
-          objdir='@{objdir}'
-          debug='${debug.compile}'>
-            <compiler refid='${compiler.name}-Compiler'/>
-            <fileset dir='@{srcdir}' includes='@{infiles}'/>
-            <custom-cc-elements/>
-      </cc>
-
-    </sequential>
-  </macrodef>
-
-  <!--
-    Do a cpp link which results in either a library (linktype of plugin, shared, or static)
-    or an executable (linktype of executable).
-    Inherits from "Tuscany-BaseLinker"
-    cpp-link-core does not link in libtuscany_sca.so, whereas cpp-link does
-    @param outfile - name of the library to create, OS prefixes and suffixes will be added
-    @param destdir - directory where the library will be written
-    @param infiles - a space seperated list of the object files to link
-    @param linktype - executable, plugin, shared, static
-    @param custom-ld-elements - any extra cpp elements, may also be extra <libset> elements
-  -->
-  <macrodef name="cpp-link-core">
-    <attribute name="outfile" default="out"/>
-    <attribute name="outdir" default="."/>
-    <attribute name="indir" default="."/>
-    <attribute name="infiles" default="*${object.ext}"/>
-    <attribute name="linktype" default="shared"/>
-    <element name="custom-ld-elements" optional="true"/>
-    <sequential>
-      <mkdir dir='@{outdir}'/>
-      <cc link='@{linktype}'
-          subsystem='console'
-          outfile='@{outdir}/@{outfile}'
-          debug='${debug.compile}'>
-            <linker refid='${compiler.name}-Linker'/>
-            <fileset dir='@{indir}' includes='@{infiles}'/>
-            <libset dir="${sdo.lib.dir}" libs="${sdo.impl.library.name}"/>
-            <custom-ld-elements/>
-      </cc>
-      <cpp-embed-manifest dir="@{outdir}" file="@{outfile}" outtype="@{outtype}"/>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="cpp-link">
-    <attribute name="outfile" default="out"/>
-    <attribute name="outdir" default="."/>
-    <attribute name="indir" default="."/>
-    <attribute name="infiles" default="*${object.ext}"/>
-    <attribute name="linktype" default="shared"/>
-    <element name="custom-ld-elements" optional="true"/>
-    <sequential>
-      <mkdir dir='@{outdir}'/>
-      <cc link='@{linktype}'
-          subsystem='console'
-          outfile='@{outdir}/@{outfile}'
-          debug='${debug.compile}'>
-            <linker refid='${compiler.name}-Linker'/>
-            <fileset dir='@{indir}' includes='@{infiles}'/>
-            <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
-            <libset dir="${sdo.lib.dir}" libs="${sdo.impl.library.name}"/>
-            <custom-ld-elements/>
-      </cc>
-      <cpp-embed-manifest dir="@{outdir}" file="@{outfile}" outtype="@{linktype}"/>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Do a cpp build which compiles and links, resulting in either a library (linktype
-    of plugin, shared, or static) or an executable (linktype of executable).
-    Inherits from both "Tuscany-BaseCompiler" and "Tuscany-BaseLinker"
-    @param srcdir  - directory where the source files are located.
-    @param infiles - a space seperated list of the source files to compile and link
-    @param outdir  - directory where the output file will be written
-    @param outfile - name of the library or binary to create, OS prefixes and suffixes may be added
-    @param outtype - executable, plugin, shared, static
-    @param custom-build-elements - any extra elements needed for compiling or linking
-                                   may also be extra <includepath> or <libset> elements
-  -->
-  <macrodef name="cpp-build">
-    <attribute name="srcdir" default="."/>
-    <attribute name="infiles" default="*.cpp"/>
-    <attribute name="outdir" default="."/>
-    <attribute name="outfile" default="out"/>
-    <attribute name="outtype" default="shared"/>
-    <element name="custom-build-elements" optional="true"/>
-    <sequential>
-      <mkdir dir='@{outdir}'/>
-      <cc outtype='@{outtype}'
-          subsystem='console'
-          objdir='@{outdir}'
-          outfile='@{outdir}/@{outfile}'
-          debug='${debug.compile}'>
-            <compiler refid='${compiler.name}-Compiler'/>
-            <linker refid='${compiler.name}-Linker'/>
-            <fileset dir='@{srcdir}' includes='@{infiles}'/>
-            <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
-            <libset dir="${sdo.lib.dir}" libs="${sdo.impl.library.name}"/>
-            <custom-build-elements/>
-      </cc>
-      <cpp-embed-manifest dir="@{outdir}" file="@{outfile}" outtype="@{outtype}"/>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Install a single file
-    @param file - file to install
-    @param srcdir - directory of file to install
-    @param destdir - Where to install the file
-    @param executable - set permissions to executable, defaults true
-  -->
-  <macrodef name="cpp-install-file">
-    <attribute name="srcfile"/>
-    <attribute name="srcdir" default="."/>
-    <attribute name="destfile" default="@{srcfile}"/>
-    <attribute name="destdir"/>
-    <attribute name="executable" default="true"/>
-    <sequential>
-      <mkdir dir="@{destdir}"/>
-      <copy file="@{srcdir}/@{srcfile}" tofile="@{destdir}/@{destfile}" overwrite='true'/>
-      <if>
-        <equals arg1="@{executable}" arg2="true"/>
-        <then>
-          <chmod file="@{destdir}/@{destfile}" perm="755"/>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Install multiple files
-    @param files - space seperated list of files to install
-    @param srcdir - location of files to install
-    @param destdir - Where to install files
-    @param executable - set permissions to executable, defaults false
-  -->
-  <macrodef name="cpp-install-files">
-    <attribute name="files" default="*.*"/>
-    <attribute name="srcdir" default="."/>
-    <attribute name="destdir"/>
-    <attribute name="executable" default="false"/>
-    <sequential>
-      <mkdir dir="@{destdir}"/>
-      <copy todir="@{destdir}" overwrite='true'>
-        <fileset dir="@{srcdir}" includes="@{files}"/>
-      </copy>
-      <if>
-        <equals arg1="@{executable}" arg2="true"/>
-        <then>
-          <chmod file="@{destdir}/@{files}" perm="755"/>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Install a library
-    @param lib - library to install
-    @param srcdir - directory of file to install
-    @param destdir - Where to install the file
-    @param executable - set permissions to executable, defaults true
-  -->
-  <macrodef name="cpp-install-lib">
-    <attribute name="lib"/>
-    <attribute name="srcdir" default="."/>
-    <attribute name="destrootdir"/>
-    <attribute name="version" default="${tuscanySCA.library.version}"/>
-    <sequential>
-      <cpp-install-file
-          srcfile="${lib.prefix}@{lib}${lib.ext}"
-          srcdir="@{srcdir}"
-          destfile="${lib.prefix}@{lib}${lib.ext}@{version}"
-          destdir="@{destrootdir}/lib"/>
-      <if>
-        <os family="windows"/>
-        <then>
-          <cpp-install-file
-              srcfile="${lib.prefix}@{lib}${dll.ext}"
-              srcdir="@{srcdir}"
-              destfile="${lib.prefix}@{lib}${dll.ext}@{version}"
-              destdir="@{destrootdir}/bin"/>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Create a symlink on unix and mac only
-    @param lib - library file to install
-    @param srclibdir - location of library files to install
-    @param destlibdir - Where to install library files
-  -->
-  <macrodef name="cpp-symlink">
-    <attribute name="linkdir" default=""/>
-    <attribute name="resourcedir" default="."/>
-    <attribute name="link"/>
-    <attribute name="resource"/>
-    <sequential>
-      <if>
-        <or>
-          <os family="unix"/>
-          <os family="mac"/>
-        </or>
-        <then>
-          <mkdir dir="@{linkdir}"/>
-          <symlink
-              link="@{linkdir}/@{link}"
-              resource="@{resourcedir}/@{resource}"
-              overwrite="true"/>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Embed the manifest in the library or executable on Windows only
-    Uses the Microsoft manifest tool "mt"
-    @param dir - the directory where the lib/exe resides
-    @param file - the filename with no suffixes or prefixes
-    @param outtype - the outtype that's passed to the cc task, used to create the filename
-    -->
-  <macrodef name="cpp-embed-manifest">
-    <attribute name="dir"/>
-    <attribute name="file"/>
-    <attribute name="outtype"/>
-      <sequential>
-      <if>
-        <os family="windows"/>
-        <then>
-          <if>
-            <equals arg1="@{outtype}" arg2="executable"/>
-            <then>
-              <property name="file.name" value="@{file}${exe.ext}"/>
-            </then>
-          </if>
-          <property name="file.name" value="${lib.prefix}@{file}${dll.ext}"/>
-
-          <exec executable="mt">
-            <arg line="-manifest @{dir}/${file.name}.manifest -outputresource:@{dir}/${file.name};2"/>
-          </exec>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-  <!--
-    Delete files from a directory, and possible delete the directory
-    @param files - space seperated list of files to delete
-    @param headerdir - directory where files to delete are
-    @param quiet - verbosity, "true" or "false"
-    @param rmdir - delete the directory after deleting files, "true" or "false"
-    @param custom-delete-elements - anything else you need done additionally
-  -->
-  <macrodef name="cpp-clean-files">
-    <attribute name="files" default="*.*"/>
-    <attribute name="dir" default="."/>
-    <attribute name="quiet" default="true"/>
-    <attribute name="rmdir" default="false"/>
-    <element name="custom-delete-elements" optional="true"/>
-    <sequential>
-      <delete quiet="@{quiet}">
-        <fileset dir="@{dir}" includes="@{files}"/>
-      </delete>
-      <if>
-        <equals arg1="@{rmdir}" arg2="true"/>
-        <then>
-          <delete dir="@{dir}"/>
-        </then>
-      </if>
-      <custom-delete-elements/>
-    </sequential>
-  </macrodef>
-    
-  <!--
-    Delete a library from a root library directory, and possible delete the directory
-    On windows, it will delete both bin/<library>.dll and lib/<library>.lib
-    On Unix, it will delete lib/<library>
-    @param lib - library to delete
-    @param librootdir - directory where the library to delete is located
-    @param quiet - verbosity, "true" or "false"
-  -->
-  <macrodef name="cpp-clean-lib">
-    <attribute name="lib"/>
-    <attribute name="librootdir"/>
-    <attribute name="quiet" default="true"/>
-    <attribute name="version" default="${tuscanySCA.library.version}"/>
-    <sequential>
-      <delete quiet="@{quiet}" file="@{librootdir}/lib/${lib.prefix}@{lib}${lib.ext}"/>
-      <delete quiet="@{quiet}" file="@{librootdir}/lib/${lib.prefix}@{lib}${lib.ext}@{version}"/>
-      <if>
-        <os family="windows"/>
-        <then>
-          <delete quiet="@{quiet}" file="@{librootdir}/bin/${lib.prefix}@{lib}${dll.ext}@{version}"/>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-</project>
diff --git a/cpp/sca/antscripts/platform.properties b/cpp/sca/antscripts/platform.properties
deleted file mode 100755
index 99d6be9a02..0000000000
--- a/cpp/sca/antscripts/platform.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-#  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.
-
-platform.lib.ext=
-platform.dll.ext=
-platform.exe.ext=
-platform.object.ext=
-platform.script.ext=
-platform.compiler.name=
-platform.debug.compile=
-platform.external.definitions.file=
-platform.sdo.impl.library.name=
-
-platform.tuscanySCA.root.dir=
-platform.tuscanySCA.install.dir=
-platform.tuscanySDO.install.dir=
-
-platform.axis2c.home.dir=
-platform.php.include.dir=
-platform.php.lib.dir=
-platform.php.sca.sdo.include.dir=
-platform.php.sca.sdo.lib.dir=
-platform.python.include.dir=
-platform.python.lib.dir=
-platform.python.version=
-platform.ruby.include.dir=
-platform.ruby.lib.dir=
-platform.rest.curl.lib.dir=
-platform.rest.curl.include.dir=
-platform.rest.httpd.include.dir=
-platform.rest.apr.include.dir=
diff --git a/cpp/sca/antscripts/system.xml b/cpp/sca/antscripts/system.xml
deleted file mode 100644
index ba718ec76a..0000000000
--- a/cpp/sca/antscripts/system.xml
+++ /dev/null
@@ -1,740 +0,0 @@
-<?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 name="system-import">
-
-  <property file="${basedir}/antscripts/platform.properties"/>
-  <property environment="env"/>
-
-  <!-- These 3 lines pull in antcontrib and cctasks -->
-  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-  <taskdef resource="cpptasks.tasks"/>
-  <typedef resource="cpptasks.types"/>
-
-  <!--
-     Configure the tuscanySDO.install.dir, sdo.include.dir, and sdo.lib.dir
-     Take the override value from platform.properties if set
-     Else take it from the env var TUSCANY_SDOCPP
-     Else fail since we cant compile without it
-  -->
-  <if>
-    <and>
-      <isset property="platform.tuscanySDO.install.dir"/>
-      <length string="${platform.tuscanySDO.install.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="tuscanySDO.install.dir" location="${platform.tuscanySDO.install.dir}"/>
-    </then>
-    <elseif>
-      <isset property="env.TUSCANY_SDOCPP"/>
-      <then>
-        <property name="tuscanySDO.install.dir" location="${env.TUSCANY_SDOCPP}"/>
-      </then>
-    </elseif>
-    <else>
-      <fail message="Unable to find SDO installation, must be set by TUSCANY_SDOCPP or in platform.properties file"/>
-    </else>
-  </if>
-  <property name="sdo.include.dir" location="${tuscanySDO.install.dir}/include"/>
-  <property name="sdo.lib.dir"     location="${tuscanySDO.install.dir}/lib"/>
-
-  <!--
-     Configure the SDO impl library name which allows for sdo impls other than tuscanySDO
-     Take the override value from platform.properties if set
-  -->
-  <if>
-    <and>
-      <isset property="platform.sdo.impl.library.name"/>
-      <length string="${platform.sdo.impl.library.name}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="sdo.impl.library.name" value="${platform.sdo.impl.library.name}"/>
-    </then>
-    <else>
-      <property name="sdo.impl.library.name" value="tuscany_sdo"/>
-    </else>
-  </if>
-
-  <!--
-     Configure the tuscanySCA.root.dir
-     Take the override value from platform.properties if set
-  -->
-  <if>
-    <and>
-      <isset property="platform.tuscanySCA.root.dir"/>
-      <length string="${platform.tuscanySCA.root.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="tuscanySCA.root.dir" location="${platform.tuscanySCA.root.dir}"/>
-    </then>
-    <else>
-      <property name="tuscanySCA.root.dir" location="."/>
-    </else>
-  </if>
-
-  <property name="tuscanySCA.root.src.dir" location="${tuscanySCA.root.dir}/runtime"/>
-
-  <!--
-     Configure the tuscanySCA.install.dir
-     Take the override value from platform.properties if set
-     Else take it from the env var TUSCANY_SCACPP
-     Else use a default of ${tuscanySCA.root.dir}/deploy
-  -->
-  <if>
-    <and>
-      <isset property="platform.tuscanySCA.install.dir"/>
-      <length string="${platform.tuscanySCA.install.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="tuscanySCA.install.dir" location="${platform.tuscanySCA.install.dir}"/>
-    </then>
-    <elseif>
-      <isset property="env.TUSCANY_SCACPP"/>
-      <then>
-        <property name="tuscanySCA.install.dir" location="${env.TUSCANY_SCACPP}"/>
-      </then>
-    </elseif>
-    <else>
-      <property name="tuscanySCA.install.dir" location="${tuscanySCA.root.dir}/deploy"/>
-    </else>
-  </if>
-
-  <!--
-     Configure the version for all tuscanySCA libraries
-     If on windows, set it to empty
-     Else take the override value from platform.properties if set
-     Else default it to "0.0.0"
-  -->
-  <if>
-    <os family="windows"/>
-    <then>
-      <property name="tuscanySCA.library.version" value=""/>
-    </then>
-    <elseif>
-      <and>
-        <isset property="platform.tuscanySCA.library.version"/>
-        <length string="${platform.tuscanySCA.library.version}" when="greater" length="0" trim="true"/>
-      </and>
-      <then>
-        <property name="tuscanySCA.library.version" value="${platform.tuscanySCA.library.version}"/>
-      </then>
-    </elseif>
-    <else>
-      <property name="tuscanySCA.library.version" value=".0.0.0"/>
-    </else>
-  </if>
-
-  <!--
-     Configure ${enable_ws} and ${axis2c.home.dir}, which is needed to compile the ws extension
-     Take the override value from platform.properties if set
-     Else take it from the env var AXIS2C_HOME
-  -->
-  <target name="check.ws">
-  <if>
-    <and>
-      <isset property="platform.axis2c.home.dir"/>
-      <length string="${platform.axis2c.home.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="enable_ws" value="true"/>
-      <property name="axis2c.home.dir" location="${platform.axis2c.home.dir}"/>
-    </then>
-    <elseif>
-      <isset property="env.AXIS2C_HOME"/>
-      <then>
-        <property name="enable_ws" value="true"/>
-        <property name="axis2c.home.dir" location="${env.AXIS2C_HOME}"/>
-      </then>
-    </elseif>
-    <else>
-      <echo message="TuscanySCA ws extension is not enabled" level="warning"/>
-    </else>
-  </if>
-  </target>
-
-  <!--
-     Configure ${enable_python} and related python properties, which are needed
-     to compile the python extension
-     Take the override value from platform.properties if set
-     Else check env vars PYTHON_LIB, PYTHON_INCLUDE, and PYTHON_VERSION
-  -->
-  <target name="check.python">
-  <if>
-    <and>
-      <isset property="platform.python.version"/>
-      <isset property="platform.python.include.dir"/>
-      <isset property="platform.python.lib.dir"/>
-      <length string="${platform.python.version}" when="greater" length="0" trim="true"/>
-      <length string="${platform.python.include.dir}" when="greater" length="0" trim="true"/>
-      <length string="${platform.python.lib.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="enable_python" value="true"/>
-      <property name="python.lib.dir"     location="${platform.python.lib.dir}"/>
-      <property name="python.include.dir" location="${platform.python.include.dir}"/>
-      <property name="python.version"     value="${platform.python.version}"/>
-    </then>
-    <elseif>
-      <and>
-        <isset property="env.PYTHON_LIB"/>
-        <isset property="env.PYTHON_INCLUDE"/>
-        <isset property="env.PYTHON_VERSION"/>
-      </and>
-      <then>
-        <property name="enable_python" value="true"/>
-        <property name="python.lib.dir"     location="${env.PYTHON_LIB}"/>
-        <property name="python.include.dir" location="${env.PYTHON_INCLUDE}"/>
-        <property name="python.version"     value="${env.PYTHON_VERSION}"/>
-      </then>
-    </elseif>
-    <else>
-      <echo message="TuscanySCA python extension is not enabled" level="warning"/>
-    </else>
-  </if>
-  </target>
-
-  <!--
-     Configure ${enable_ruby} and related ruby properties, which are needed
-     to compile the ruby extension
-     Take the override value from platform.properties if set
-     Else check env vars RUBY_LIB and RUBY_INCLUDE
-  -->
-  <target name="check.ruby">
-  <if>
-    <and>
-      <isset property="platform.ruby.include.dir"/>
-      <isset property="platform.ruby.lib.dir"/>
-      <length string="${platform.ruby.include.dir}" when="greater" length="0" trim="true"/>
-      <length string="${platform.ruby.lib.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="enable_ruby" value="true"/>
-      <property name="ruby.lib.dir"     location="${platform.ruby.lib.dir}"/>
-      <property name="ruby.include.dir" location="${platform.ruby.include.dir}"/>
-    </then>
-    <elseif>
-      <and>
-        <isset property="env.RUBY_LIB"/>
-        <isset property="env.RUBY_INCLUDE"/>
-      </and>
-      <then>
-        <property name="enable_ruby" value="true"/>
-        <property name="ruby.lib.dir"     location="${env.RUBY_LIB}"/>
-        <property name="ruby.include.dir" location="${env.RUBY_INCLUDE}"/>
-      </then>
-    </elseif>
-    <else>
-      <echo message="TuscanySCA ruby extension is not enabled" level="warning"/>
-    </else>
-  </if>
-  </target>
-
-  <!--
-     Configure ${enable_rest} and related ruby properties, which are needed
-     to compile the rest extension
-     Take the override value from platform.properties if set
-     Else check env vars CURL_LIB, CURL_INCLUDE, HTTPD_INCLUDE, and APR_INCLUDE
-  -->
-  <target name="check.rest">
-  <if>
-    <and>
-      <isset property="platform.rest.include.dir"/>
-      <isset property="platform.rest.lib.dir"/>
-      <length string="${platform.rest.include.dir}" when="greater" length="0" trim="true"/>
-      <length string="${platform.rest.lib.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="enable_rest" value="true"/>
-      <property name="rest.curl.lib.dir"       location="${platform.rest.curl.lib.dir}"/>
-      <property name="rest.curl.include.dir"   location="${platform.rest.curl.include.dir}"/>
-      <property name="rest.httpd.include.dir"  location="${platform.rest.httpd.include.dir}"/>
-      <property name="rest.apr.include.dir"    location="${platform.rest.apr.include.dir}"/>
-    </then>
-    <elseif>
-      <and>
-        <isset property="env.CURL_LIB"/>
-        <isset property="env.CURL_INCLUDE"/>
-        <isset property="env.HTTPD_INCLUDE"/>
-        <isset property="env.APR_INCLUDE"/>
-      </and>
-      <then>
-        <property name="enable_rest" value="true"/>
-        <property name="rest.curl.lib.dir"       location="${env.CURL_LIB}"/>
-        <property name="rest.curl.include.dir"   location="${env.CURL_INCLUDE}"/>
-        <property name="rest.httpd.include.dir"  location="${env.HTTPD_INCLUDE}"/>
-        <property name="rest.apr.include.dir"    location="${env.APR_INCLUDE}"/>
-      </then>
-    </elseif>
-    <else>
-      <echo message="TuscanySCA rest extension is not enabled" level="warning"/>
-    </else>
-  </if>
-  </target>
-
-  <!--
-     Configure ${enable_php} and related php properties, which are needed
-     to compile the php extension
-     Take the override value from platform.properties if set
-     Else check env vars CURL_LIB, CURL_INCLUDE, HTTPD_INCLUDE, and APR_INCLUDE
-  -->
-  <target name="check.php">
-  <if>
-    <and>
-      <isset property="platform.php.include.dir"/>
-      <isset property="platform.php.lib.dir"/>
-      <isset property="platform.php.sca.sdo.include.dir"/>
-      <isset property="platform.php.sca.sdo.lib.dir"/>
-      <length string="${platform.php.include.dir}" when="greater" length="0" trim="true"/>
-      <length string="${platform.php.lib.dir}" when="greater" length="0" trim="true"/>
-      <length string="${platform.php.sca.sdo.include.dir}" when="greater" length="0" trim="true"/>
-      <length string="${platform.php.sca.sdo.lib.dir}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="enable_php" value="true"/>
-      <property name="php.include.dir"          location="${platform.php.include.dir}"/>
-      <property name="php.lib.dir"              location="${platform.php.lib.dir}"/>
-      <property name="php.sca.sdo.include.dir"  location="${platform.php.sca.sdo.include.dir}"/>
-      <property name="php.sca.sdo.lib.dir"      location="${platform.php.sca.sdo.lib.dir}"/>
-    </then>
-    <elseif>
-      <and>
-        <isset property="env.PHP_LIB"/>
-        <isset property="env.PHP_INCLUDE"/>
-        <isset property="env.PHP_SCA_SDO_LIB"/>
-        <isset property="env.PHP_SCA_SDO_INCLUDE"/>
-      </and>
-      <then>
-        <property name="enable_php" value="true"/>
-        <property name="php.include.dir"          location="${env.PHP_INCLUDE}"/>
-        <property name="php.lib.dir"              location="${env.PHP_LIB}"/>
-        <property name="php.sca.sdo.include.dir"  location="${env.PHP_SCA_SDO_INCLUDE}"/>
-        <property name="php.sca.sdo.lib.dir"      location="${env.PHP_SCA_SDO_LIB}"/>
-      </then>
-    </elseif>
-    <else>
-      <echo message="TuscanySCA php extension is not enabled" level="warning"/>
-    </else>
-  </if>
-  </target>
-
-  <!--
-     Configure the debug.compile flag
-     Try looking first on the command line
-     Then take the override value from platform.properties if set
-     Else its false
-  -->
-  <if>
-    <isset property="debug"/>
-    <then>
-      <!-- Tests if its set on the ant command line "ant -Ddebug=true" -->
-      <if>
-        <istrue value="${debug}"/>
-        <then>
-          <property name="debug.compile" value="true"/>
-        </then>
-      </if>
-    </then>
-    <elseif>
-      <and>
-        <isset property="platform.debug.compile"/>
-        <istrue value="${platform.debug.compile}"/>
-        <length string="${platform.debug.compile}" when="greater" length="0" trim="true"/>
-      </and>
-    <then>
-      <property name="debug.compile" value="true"/>
-    </then>
-  </elseif>
-  </if>
-  <property name="debug.compile" value="false"/>
-
-  <!--
-     Configure the compiler.name
-     Take the override value from platform.properties if set
-     Else set it based on the OS
-  -->
-  <if>
-    <and>
-      <isset property="platform.compiler.name"/>
-      <length string="${platform.compiler.name}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="compiler.name" value="${platform.compiler.name}"/>
-    </then>
-    <else>
-      <condition property="compiler.name" value="msvc8">
-        <os family="windows"/>
-      </condition>
-
-      <condition property="compiler.name" value="g++">
-        <os family="unix"/>
-       </condition>
-
-      <condition property="compiler.name" value="mac_g++">
-        <os family="mac"/>
-      </condition>
-    </else>
-  </if>
-
-  <!--
-     Configure the lib.ext
-     Take the override value from platform.properties if set
-     Else set it based on the OS
-  -->
-  <if>
-    <and>
-      <isset property="platform.lib.ext"/>
-      <length string="${platform.lib.ext}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="lib.ext" value="${platform.lib.ext}"/>
-    </then>
-    <else>
-      <condition property="lib.ext" value=".lib">
-        <os family="windows"/>
-      </condition>
-
-      <condition property="lib.ext" value=".dylib">
-        <os family="mac"/>
-      </condition>
-
-      <condition property="lib.ext" value=".so">
-        <os family="unix"/>
-      </condition>
-    </else>
-  </if>
-
-  <!--
-     Configure the dll.ext, used for windows only
-     Take the override value from platform.properties if set
-     Else set it based on the OS
-  -->
-  <if>
-    <and>
-      <isset property="platform.dll.ext"/>
-      <length string="${platform.dll.ext}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="dll.ext" value="${platform.dll.ext}"/>
-    </then>
-    <else>
-      <condition property="dll.ext" value=".dll">
-        <os family="windows"/>
-      </condition>
-
-      <property name="dll.ext" value=""/>
-
-    </else>
-  </if>
-
-  <!--
-     Configure the lib.prefix
-     Take the override value from platform.properties if set
-     Else set it based on the OS
-  -->
-  <if>
-    <and>
-      <isset property="platform.lib.prefix"/>
-      <length string="${platform.lib.prefix}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="lib.prefix" value="${platform.lib.prefix}"/>
-    </then>
-    <else>
-      <condition property="lib.prefix" value="">
-        <os family="windows"/>
-      </condition>
-
-      <condition property="lib.prefix" value="lib">
-        <or>
-          <os family="unix"/>
-          <os family="mac"/>
-        </or>
-      </condition>
-    </else>
-  </if>
-
-
-  <!--
-     Configure the object.ext
-     Take the override value from platform.properties if set
-     Else set it based on the OS
-  -->
-  <if>
-    <and>
-      <isset property="platform.object.ext"/>
-      <length string="${platform.object.ext}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="object.ext" value="${platform.object.ext}"/>
-    </then>
-    <else>
-      <condition property="object.ext" value=".obj">
-        <os family="windows"/>
-      </condition>
-
-      <condition property="object.ext" value=".o">
-        <or>
-          <os family="unix"/>
-          <os family="mac"/>
-        </or>
-      </condition>
-    </else>
-  </if>
-
-
-  <!--
-     Configure the exe.ext
-     Take the override value from platform.properties if set
-     Else set it based on the OS
-  -->
-  <if>
-    <and>
-      <isset property="platform.exe.ext"/>
-      <length string="${platform.exe.ext}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="exe.ext" value="${platform.exe.ext}"/>
-    </then>
-    <else>
-      <condition property="exe.ext" value=".exe">
-        <os family="windows"/>
-      </condition>
-
-      <condition property="exe.ext" value="">
-        <or>
-          <os family="unix"/>
-          <os family="mac"/>
-        </or>
-      </condition>
-    </else>
-  </if>
-
-
-  <!--
-     Configure the script.ext
-     Take the override value from platform.properties if set
-     Else set it based on the OS
-  -->
-  <if>
-    <and>
-      <isset property="platform.script.ext"/>
-      <length string="${platform.script.ext}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="script.ext" value="${platform.script.ext}"/>
-    </then>
-    <else>
-      <condition property="script.ext" value=".bat">
-        <os family="windows"/>
-      </condition>
-
-      <condition property="script.ext" value=".sh">
-        <or>
-          <os family="unix"/>
-          <os family="mac"/>
-        </or>
-      </condition>
-    </else>
-  </if>
-
-  <condition property="windows" value="true">
-    <os family="windows"/>
-  </condition>
-
-  <condition property="mac" value="true">
-    <os family="mac"/>
-  </condition>
-
-  <condition property="unix" value="true">
-    <os family="unix"/>
-  </condition>
-
-  <!--
-     Base compiler definition
-    -->
-  <compiler id="Tuscany-BaseCompiler" multithreaded="true" exceptions="true" rtti="true">
-    <includepath path="${sdo.include.dir}"/>
-    <includepath path="${tuscanySCA.root.src.dir}"/>
-    <includepath path="${tuscanySCA.root.src.dir}/core/src"/>
-  </compiler>
-
-  <!--
-     Specific compiler definitions
-     The compilerarg location functionality completely omits the arg: antcontrib bug 1794857
-    -->
-  
-    <!-- MSVC compilers for windows -->
-  <compiler id="msvc-Compiler" extends="Tuscany-BaseCompiler" name="msvc">
-    <defineset define="WIN32,_CRT_SECURE_NO_DEPRECATE,_USRDLL,_WINDOWS"/>
-  </compiler>
-
-    <!-- The standard msvc ant contrib cc task compiler doesnt work so well,
-         so we made our own until the bugs are resolved -->
-  <!--compiler id="msvc8-Compiler" extends="Tuscany-BaseCompiler" name="msvc"-->
-  <compiler id="msvc8-Compiler"
-            extends="Tuscany-BaseCompiler"
-            classname="tuscany.antCompilers.TuscanyMSVC8DevStudioCCompiler">
-    <defineset define="WIN32,_CRT_SECURE_NO_DEPRECATE,_USRDLL,_WINDOWS"/>
-  </compiler>
-
-     <!-- g++ compiler for most Unix platforms -->
-  <compiler id="g++-Compiler" extends="Tuscany-BaseCompiler" name="g++"/>
- 
-    <!-- g++ 32 bit compiler for 64 bit platforms
-         Used for cross compilation with the -m32 flag -->
-  <compiler id="g++m32-Compiler" extends="Tuscany-BaseCompiler" name="g++">
-    <compilerarg value="-m32"/>
-  </compiler>
-
-    <!-- g++ compiler for Apple mac -->
-  <compiler id="mac_g++-Compiler" extends="Tuscany-BaseCompiler" name="g++">
-    <defineset define="IS_DARWIN"/>
-  </compiler>
-
-  <!--
-     Specific linker definitions
-     The linker extends funcionality isnt working correctly: antcontrib bug 1794867
-     Specifically, the syslibset for dl was not working on Linux
-    -->
-  <linker id="msvc-Linker" name="msvc">
-    <syslibset libs="kernel32,user32,ws2_32"/>
-  </linker>
-
-  <linker id="msvc8-Linker" name="msvc">
-    <syslibset libs="kernel32,user32,ws2_32"/>
-  </linker>
-
-  <linker id="g++-Linker" name="g++">
-    <syslibset libs="dl"/>
-  </linker>
-
-  <linker id="g++m32-Linker" name="g++">
-    <syslibset libs="dl"/>
-    <linkerarg value="-m32"/>
-  </linker>
-
-  <linker id="mac_g++-Linker" name="g++">
-    <syslibset libs="dl"/>
-  </linker>
-
-  <!--
-    Setup the external definitions file, if there is one
-  -->
-  <if>
-    <and>
-      <isset property="platform.external.definitions.file"/>
-      <length string="${platform.external.definitions.file}" when="greater" length="0" trim="true"/>
-    </and>
-    <then>
-      <property name="external.definitions.file" value="${platform.external.definitions.file}"/>
-      <import file="${external.definitions.file}"/>
-    </then>
-  </if>
-  <property name="external.definitions.file" value=""/>
-
-  <target name="display.system" depends="check.ws,check.python,check.php,check.ruby,check.rest">
-
-    <!-- Tuscany paths, etc -->
-    <echo message=" "/>
-    <echo message="TuscanySCA paths"/>
-    <echo message="  tuscanySCA.install.dir=      ${tuscanySCA.install.dir}"/>
-    <echo message="  tuscanySCA.root.dir=         ${tuscanySCA.root.dir}"/>
-    <echo message="  tuscanySCA.root.src.dir=     ${tuscanySCA.root.src.dir}"/>
-    <echo message="  tuscanySCA.install.dir=      ${tuscanySCA.install.dir}"/>
-    <echo message="  tuscanySCA.library.version=  '${tuscanySCA.library.version}'"/>
-    <echo message="  tuscanySDO.install.dir=      ${tuscanySDO.install.dir}"/>
-
-    <!-- compilers, libs, etc -->
-    <echo message=" "/>
-    <echo message="TuscanySCA compiler configuration"/>
-    <echo message="  compiler.name=               '${compiler.name}'"/>
-    <echo message="  debug.compile=               '${debug.compile}'"/>
-    <echo message="  lib.ext=                     '${lib.ext}'"/>
-    <echo message="  dll.ext=                     '${dll.ext}'"/>
-    <echo message="  lib.prefix=                  '${lib.prefix}'"/>
-    <echo message="  object.ext=                  '${object.ext}'"/>
-    <echo message="  exe.ext=                     '${exe.ext}'"/>
-    <echo message="  script.ext=                  '${script.ext}'"/>
-    <echo message="  external.definitions.file=   '${external.definitions.file}'"/>
-    <echo message="  sdo.impl.library.name=       '${sdo.impl.library.name}'"/>
-
-    <!-- ws extention -->
-    <if>
-      <isset property="enable_ws"/>
-      <then>
-        <echo message=" "/>
-        <echo message="TuscanySCA ws extension enabled"/>
-        <echo message="  axis2c.home.dir=          ${axis2c.home.dir}"/>
-      </then>
-    </if>
-
-    <!-- php extention -->
-    <if>
-      <isset property="enable_php"/>
-      <then>
-        <echo message=" "/>
-        <echo message="TuscanySCA php extension enabled"/>
-        <echo message="  php.lib.dir=              ${php.lib.dir}"/>
-        <echo message="  php.include.dir=          ${php.include.dir}"/>
-        <echo message="  php.sca.sdo.lib.dir=      ${php.sca.sdo.lib.dir}"/>
-        <echo message="  php.sca.sdo.include.dir=  ${php.sca.sdo.include.dir}"/>
-      </then>
-    </if>
-
-    <!-- python extention -->
-    <if>
-      <isset property="enable_python"/>
-      <then>
-        <echo message=" "/>
-        <echo message="TuscanySCA python extension enabled"/>
-        <echo message="  python.lib.dir=           ${python.lib.dir}"/>
-        <echo message="  python.include.dir=       ${python.include.dir}"/>
-        <echo message="  python.version=           ${python.version}"/>
-      </then>
-    </if>
-
-    <!-- rest extention -->
-    <if>
-      <isset property="enable_rest"/>
-      <then>
-        <echo message=" "/>
-        <echo message="TuscanySCA rest extension enabled"/>
-        <echo message="  rest.curl.lib.dir=        ${rest.curl.lib.dir}"/>
-        <echo message="  rest.curl.include.dir=    ${rest.curl.include.dir}"/>
-        <echo message="  rest.httpd.include.dir=   ${rest.httpd.include.dir}"/>
-        <echo message="  rest.apr.include.dir=     ${rest.apr.include.dir}"/>
-      </then>
-    </if>
-
-    <!-- ruby extention -->
-    <if>
-      <isset property="enable_ruby"/>
-      <then>
-        <echo message=" "/>
-        <echo message="TuscanySCA ruby extension enabled"/>
-        <echo message="  ruby.lib.dir=             ${ruby.lib.dir}"/>
-        <echo message="  ruby.include.dir=         ${ruby.include.dir}"/>
-      </then>
-    </if>
-
-    <echo message=" "/>
-
-  </target>
-
-</project>
diff --git a/cpp/sca/build.xml b/cpp/sca/build.xml
deleted file mode 100644
index 9acb18ca4e..0000000000
--- a/cpp/sca/build.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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 name="TuscanyScaNative" default="all" basedir=".">
-
-  <!--
-    This is the root level ant build.xml file for TuscanySCA Native
-    Nothing is actually performed here, it just delegates to subdirectory
-    build.xml files. Common scripts used by all ant build files can be
-    found in the ant subdirectory.
-  --> 
-    
-  <import file="antscripts/system.xml"/>
-
-  <property name="runtime.core.dir"  location="runtime/core"/>
-  <property name="extensions.dir"    location="runtime/extensions"/>
-  <property name="test.dir"          location="runtime/core/test"/>
-  <property name="samples.dir"       location="samples"/>
-  <property name="tools.dir"         location="tools"/>
- 	
-  <!--
-    Public targets
-  -->
-
-  <target name="all" description="build and install all TuscanyScaNative source code">
-    <antcall target="build.core"/>
-    <antcall target="install.core"/>
-    <antcall target="build.extensions"/>
-    <antcall target="install.extensions"/>
-  </target>
-
-  <target name="build" description="Build all TuscanyScaNative source code">
-    <antcall target="build.core"/>
-    <antcall target="build.extensions"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative libraries and headers">
-    <antcall target="install.core"/>
-    <antcall target="install.extensions"/>
-  </target>
-
-  <target name="samples" description="Build and Install all TuscanyScaNative samples">
-    <antcall target="build.samples"/>
-  </target>
-
-  <target name="tools" description="Build and Install all TuscanyScaNative tools">
-    <antcall target="build.tools"/>
-  </target>
-
-  <target name="tests" description="Build and run all TuscanyScaNative tests">
-    <ant target="all" antfile="${test.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative source code, samples, and tools">
-    <antcall target="clean.core"/>
-    <antcall target="clean.extensions"/>
-    <antcall target="clean.samples"/>
-    <antcall target="clean.tests"/>
-    <antcall target="clean.tools"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-    Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings
-  -->
-
-  <target name="build.core">
-    <ant target="build" antfile="${runtime.core.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.extensions">
-    <ant target="build" antfile="${extensions.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.core">
-    <ant target="install" antfile="${runtime.core.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.extensions">
-    <ant target="install" antfile="${extensions.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.samples">
-    <ant target="all" antfile="${samples.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.tools">
-    <ant target="all" antfile="${tools.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.core">
-    <ant target="clean" antfile="${runtime.core.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.extensions">
-    <ant target="clean" antfile="${extensions.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.tests">
-    <ant target="clean" antfile="${test.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.tools">
-    <ant target="clean" antfile="${tools.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.samples">
-    <ant target="clean" antfile="${samples.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/core/build.xml b/cpp/sca/runtime/core/build.xml
deleted file mode 100644
index 5ce67e35b6..0000000000
--- a/cpp/sca/runtime/core/build.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?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 name="TuscanyScaNative_core" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"           location="${basedir}/runtime/core"/>
-  <property name="src.dir"            location="${basedir}/runtime/core/src"/>
-  <property name="core.dir"           value="tuscany/sca/core"/>
-  <property name="extension.dir"      value="tuscany/sca/extension"/>
-  <property name="model.dir"          value="tuscany/sca/model"/>
-  <property name="util.dir"           value="tuscany/sca/util"/>
-
-  <property name="core.abs.dir"       location="${src.dir}/${core.dir}"/>
-  <property name="extension.abs.dir"  location="${src.dir}/${extension.dir}"/>
-  <property name="model.abs.dir"      location="${src.dir}/${model.dir}"/>
-  <property name="util.abs.dir"       location="${src.dir}/${util.dir}"/>
-  <property name="xsd.abs.dir"        location="${this.dir}/xsd"/>
-  <property name="lib.dir"            location="${src.dir}/.libs"/>
-  <property name="tuscany.core.lib"   value="tuscany_sca"/>
-
-  <!--
-    All the cpp and header files per subdirectory
-    New classes should be added to these properties
-  -->
-
-  <property
-    name="core.cpp.files"
-    value="Exceptions.cpp
-           Operation.cpp
-           SCARuntime.cpp
-           ServiceProxy.cpp
-           ServiceWrapper.cpp"/>
-  <property
-    name="core.h.files"
-    value="Exceptions.h
-           Operation.h
-           SCARuntime.h
-           ServiceProxy.h
-           ServiceWrapper.h"/>
-
-  <property
-    name="extension.cpp.files"
-    value="ImplementationExtension.cpp
-           InterfaceExtension.cpp
-           ReferenceBindingExtension.cpp
-           ServiceBindingExtension.cpp"/>
-  <property
-    name="extension.h.files"
-    value="ImplementationExtension.h
-           InterfaceExtension.h
-           ReferenceBindingExtension.h
-           ServiceBindingExtension.h"/>
-
-  <property
-    name="model.cpp.files"
-    value="Binding.cpp
-           Component.cpp
-           ComponentType.cpp
-           Composite.cpp
-           CompositeReferenceBinding.cpp
-           CompositeReference.cpp
-           CompositeService.cpp
-           Contract.cpp
-           Interface.cpp
-           ModelLoader.cpp
-           ReferenceBinding.cpp
-           Reference.cpp
-           ReferenceType.cpp
-           ServiceBinding.cpp
-           Service.cpp
-           ServiceType.cpp
-           Wire.cpp
-           WSDLDefinition.cpp
-           WSDLInterface.cpp
-           WSDLMessagePart.cpp
-           WSDLOperation.cpp"/>
-  <property
-    name="model.h.files"
-    value="Binding.h
-           Component.h
-           ComponentType.h
-           Composite.h
-           CompositeReferenceBinding.h
-           CompositeReference.h
-           CompositeService.h
-           Contract.h
-           Interface.h
-           ModelLoader.h
-           ReferenceBinding.h
-           Reference.h
-           ReferenceType.h
-           ServiceBinding.h
-           Service.h
-           ServiceType.h
-           Wire.h
-           WSDLDefinition.h
-           WSDLInterface.h
-           WSDLMessagePart.h
-           WSDLOperation.h"/>
-
-  <property
-    name="util.cpp.files"
-    value="DefaultLogWriter.cpp
-           File.cpp
-           FileLogWriter.cpp
-           Library.cpp
-           Logger.cpp
-           LogWriter.cpp
-           Mutex.cpp
-           Queue.cpp
-           SDOUtils.cpp
-           Thread.cpp
-           ThreadLocal.cpp
-           Utils.cpp"/>
-
-  <property
-    name="util.h.files"
-    value="DefaultLogWriter.h
-           File.h
-           FileLogWriter.h
-           Library.h
-           Logger.h
-           Logging.h
-           LogWriter.h
-           Mutex.h
-           Queue.h
-           SDOUtils.h
-           Thread.h
-           ThreadLocal.h
-           Utils.h"/>
-
-  <!--
-    All the xsd schema files
-    New schema should be added to this property
-  -->
-  <property
-    name="xsd.files"
-    value="sca.xsd
-           sca-core.xsd
-           sca-implementation-composite.xsd
-           sca-implementation-java.xsd
-           sca-interface-java.xsd
-           sca-interface-wsdl.xsd
-           tuscany.xsd
-           wsdl_11_http.xsd
-           wsdl_11_mime.xsd
-           wsdl_11_soap12.xsd
-           wsdl_11_soap.xsd
-           wsdl_11.xsd"/>
-
-  <!--
-    Public targets
-  -->
-  <target name="all" description="compile, link, and install all TuscanyScaNative core source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="compile and link all TuscanyScaNative core source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative core source code">
-    <antcall target="compile.core"/>
-    <antcall target="compile.extension"/>
-    <antcall target="compile.model"/>
-    <antcall target="compile.util"/>
-  </target>
-
-  <target name="link" description="Link all TuscanyScaNative core source code">
-    <cpp-link-core
-        outfile="${tuscany.core.lib}"
-        outdir="${lib.dir}"
-        indir="${lib.dir}"
-        infiles="*${object.ext}"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative core libraries and headers">
-    <antcall target="install.core"/>
-    <antcall target="install.extension"/>
-    <antcall target="install.model"/>
-    <antcall target="install.util"/>
-    <antcall target="install.xsd"/>
-    <cpp-install-files
-        srcdir="${src.dir}/tuscany/sca"
-        files="export.h"
-        destdir="${tuscanySCA.install.dir}/include/tuscany/sca"/>
-    <cpp-install-lib
-        lib="${tuscany.core.lib}"
-        srcdir="${lib.dir}"
-        destrootdir="${tuscanySCA.install.dir}"/>
-    <cpp-symlink
-        linkdir="${tuscanySCA.install.dir}/lib"
-        link="${lib.prefix}${tuscany.core.lib}${lib.ext}"
-        resource="${lib.prefix}${tuscany.core.lib}${lib.ext}${tuscanySCA.library.version}"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative core compiled source code">
-    <antcall target="clean.core"/>
-    <antcall target="clean.extension"/>
-    <antcall target="clean.model"/>
-    <antcall target="clean.util"/>
-    <antcall target="clean.xsd"/>
-    <delete dir="${lib.dir}" quiet="true"/>
-    <cpp-clean-files
-        dir="${tuscanySCA.install.dir}/include/tuscany/sca"
-        files="export.h"
-        rmdir="true"/>
-    <cpp-clean-lib
-    	lib="${tuscany.core.lib}"
-        librootdir="${tuscanySCA.install.dir}"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.core">
-    <cpp-compile
-        srcdir="${core.abs.dir}"
-        objdir="${lib.dir}"
-        infiles="${core.cpp.files}">
-      <custom-cc-elements>
-        <defineset if="windows" define="SCA_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.extension">
-    <cpp-compile
-        srcdir="${extension.abs.dir}"
-        objdir="${lib.dir}"
-        infiles="${extension.cpp.files}">
-      <custom-cc-elements>
-        <defineset if="windows" define="SCA_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.model">
-    <cpp-compile
-        srcdir="${model.abs.dir}"
-        objdir="${lib.dir}"
-        infiles="${model.cpp.files}">
-      <custom-cc-elements>
-        <defineset if="windows" define="SCA_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.util">
-    <cpp-compile
-        srcdir="${util.abs.dir}"
-        objdir="${lib.dir}"
-        infiles="${util.cpp.files}">
-      <custom-cc-elements>
-        <defineset if="windows" define="SCA_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.core">
-    <cpp-install-files
-        srcdir="${core.abs.dir}"
-        files="${core.h.files}"
-        destdir="${tuscanySCA.install.dir}/include/${core.dir}"/>
-  </target>
-
-  <target name="install.extension">
-    <cpp-install-files
-        srcdir="${extension.abs.dir}"
-        files="${extension.h.files}"
-        destdir="${tuscanySCA.install.dir}/include/${extension.dir}"/>
-  </target>
-
-  <target name="install.model">
-    <cpp-install-files
-        srcdir="${model.abs.dir}"
-        files="${model.h.files}"
-        destdir="${tuscanySCA.install.dir}/include/${model.dir}"/>
-  </target>
-
-  <target name="install.util">
-    <cpp-install-files
-        srcdir="${util.abs.dir}"
-        files="${util.h.files}"
-        destdir="${tuscanySCA.install.dir}/include/${util.dir}"/>
-  </target>
-
-  <target name="install.xsd">
-    <cpp-install-files
-        srcdir="${xsd.abs.dir}"
-        files="${xsd.files}"
-        destdir="${tuscanySCA.install.dir}/xsd"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.core">
-    <cpp-clean-files
-        dir="${tuscanySCA.install.dir}/include/${core.dir}"
-        rmdir="true"/>
-  </target>
-
-  <target name="clean.extension">
-    <cpp-clean-files
-        dir="${tuscanySCA.install.dir}/include/${extension.dir}"
-        rmdir="true"/>
-  </target>
-
-  <target name="clean.model">
-    <cpp-clean-files
-        dir="${tuscanySCA.install.dir}/include/${model.dir}"
-        rmdir="true"/>
-  </target>
-
-  <target name="clean.util">
-    <cpp-clean-files
-        dir="${tuscanySCA.install.dir}/include/${util.dir}"
-        rmdir="true"/>
-  </target>
-
-  <target name="clean.xsd">
-    <cpp-clean-files
-        dir="${tuscanySCA.install.dir}/xsd"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/core/test/build.xml b/cpp/sca/runtime/core/test/build.xml
deleted file mode 100644
index 5ceb05b623..0000000000
--- a/cpp/sca/runtime/core/test/build.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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 name="TuscanySdoNative_test" default="all" basedir="../../..">

-

-  <import file="${basedir}/antscripts/system.xml"/>

-  <import file="${basedir}/antscripts/compile-targets.xml"/>

-

-  <!--

-    Notice that the basedir for this project is set to the TuscanySDO root dir

-    This makes path setting in system.xml much simpler, but we'll just have to

-    set a property here to this directory.

-  -->

-  <property name="this.dir"                      location="${basedir}/runtime/core/test"/>

-  <property name="sca.test.src.dir"              location="${this.dir}"/>

-  <property name="sca.test.build.dir"            location="${this.dir}/build"/>

-  <property name="sca.wsdl.test.src.dir"         location="${this.dir}/wsdlTests"/>

-  <property name="sca.composite.test.src.dir"    location="${this.dir}/compositeTests"/>

-  <property name="sca.test.app"                  value="sca_test"/>

-

-  <property name="wsdl.test.files"

-            value="BaseWsdlTest.cpp

-                   WSDLErrorsTest.cpp

-                   WSDLDefinitionTest.cpp"/>

-  <!--

-    Public targets

-  -->

-  <target name="all" description="compile, link, and run TuscanyScaNative test suite">

-    <antcall target="build"/>

-    <antcall target="run"/>

-  </target>

-

-  <target name="build" description="compile and link TuscanyScaNative test suite">

-    <antcall target="build.wsdl.tests"/>

-    <antcall target="build.composite.tests"/>

-    <antcall target="build.main"/>

-  </target>

-

-  <target name="run" depends="build" description="Run TuscanyScaNative test suite">

-    <exec executable="${this.dir}/${sca.test.app}${script.ext}" dir="${this.dir}"/>

-  </target>

-

-  <target name="clean" description="Clean TuscanyScaNative test suite">

-    <delete dir="${sca.test.build.dir}" quiet="@{quiet}"/>

-    <delete file="${this.dir}/${sca.test.app}${exe.ext}" quiet="@{quiet}"/>

-  </target>

-

-  <!--

-    Internal targets

-    They can still be called, they're just not described, so wont show up in "ant -p"

-  -->

-  <target name="build.wsdl.tests">

-    <cpp-compile

-        srcdir="${sca.wsdl.test.src.dir}"

-        infiles="${wsdl.test.files}"

-        objdir="${sca.test.build.dir}">

-      <custom-cc-elements>

-        <defineset if="windows" define="_MBCS"/>

-        <includepath path="${sca.test.src.dir}"/>

-        <includepath path="${sca.wsdl.test.src.dir}"/>

-      </custom-cc-elements>

-    </cpp-compile>

-  </target>

-

-  <target name="build.composite.tests">

-    <!-- Not implemented yet -->

-  </target>

-

-  <target name="build.main">

-    <!-- first compile the main.cpp -->

-    <cpp-compile

-        srcdir="${sca.test.src.dir}"

-        infiles="main.cpp"

-        objdir="${sca.test.build.dir}">

-      <custom-cc-elements>

-        <defineset if="windows" define="_MBCS"/>

-        <includepath path="${sca.test.src.dir}"/>

-      </custom-cc-elements>

-    </cpp-compile>

-

-    <cpp-link

-        outfile="${sca.test.app}"

-        outdir="${sca.test.build.dir}"

-        indir="${sca.test.build.dir}"

-        linktype="executable">

-    </cpp-link>

-

-    <cpp-install-file

-        srcfile="${sca.test.app}${exe.ext}"

-        srcdir="${sca.test.build.dir}"

-        destdir="${this.dir}"/>

-  </target>

-

-</project>

diff --git a/cpp/sca/runtime/extensions/build.xml b/cpp/sca/runtime/extensions/build.xml
deleted file mode 100644
index 70d65faa71..0000000000
--- a/cpp/sca/runtime/extensions/build.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?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 name="TuscanyScaNative_extensions" default="all" basedir="../..">
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"    location="${basedir}/runtime/extensions"/>
-  <property name="cpp.dir"     location="${this.dir}/cpp"/>
-  <property name="php.dir"     location="${this.dir}/php"/>
-  <property name="python.dir"  location="${this.dir}/python"/>
-  <property name="rest.dir"    location="${this.dir}/rest"/>
-  <property name="ruby.dir"    location="${this.dir}/ruby"/>
-  <property name="sca.dir"     location="${this.dir}/sca"/>
-  <property name="ws.dir"      location="${this.dir}/ws"/>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-      description="build and install all TuscanyScaNative extensions source code">
-    <antcall target="build"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="Build all TuscanyScaNative extensions source code">
-    <antcall target="build.extension.cpp"/>
-    <antcall target="build.extension.php"/>
-    <antcall target="build.extension.python"/>
-    <antcall target="build.extension.rest"/>
-    <antcall target="build.extension.ruby"/>
-    <antcall target="build.extension.sca"/>
-    <antcall target="build.extension.ws"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative extensions libraries and headers">
-    <antcall target="install.extension.cpp"/>
-    <antcall target="install.extension.php"/>
-    <antcall target="install.extension.python"/>
-    <antcall target="install.extension.rest"/>
-    <antcall target="install.extension.ruby"/>
-    <antcall target="install.extension.sca"/>
-    <antcall target="install.extension.ws"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative extensions built source code">
-    <antcall target="clean.extension.cpp"/>
-    <antcall target="clean.extension.php"/>
-    <antcall target="clean.extension.python"/>
-    <antcall target="clean.extension.rest"/>
-    <antcall target="clean.extension.ruby"/>
-    <antcall target="clean.extension.sca"/>
-    <antcall target="clean.extension.ws"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-    Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings
-  -->
-
-    <!-- build -->
-
-  <target name="build.extension.cpp">
-    <ant target="build" antfile="${cpp.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.extension.php">
-    <ant target="build" antfile="${php.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.extension.python">
-    <ant target="build" antfile="${python.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.extension.rest">
-    <ant target="build" antfile="${rest.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.extension.ruby">
-    <ant target="build" antfile="${ruby.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.extension.sca">
-    <ant target="build" antfile="${sca.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.extension.ws">
-    <ant target="build" antfile="${ws.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.extension.cpp">
-    <ant target="install" antfile="${cpp.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.extension.php">
-    <ant target="install" antfile="${php.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.extension.python">
-    <ant target="install" antfile="${python.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.extension.rest">
-    <ant target="install" antfile="${rest.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.extension.ruby">
-    <ant target="install" antfile="${ruby.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.extension.sca">
-    <ant target="install" antfile="${sca.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.extension.ws">
-    <ant target="install" antfile="${ws.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.extension.cpp">
-    <ant target="clean" antfile="${cpp.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.extension.php">
-    <ant target="clean" antfile="${php.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.extension.python">
-    <ant target="clean" antfile="${python.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.extension.rest">
-    <ant target="clean" antfile="${rest.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.extension.ruby">
-    <ant target="clean" antfile="${ruby.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.extension.sca">
-    <ant target="clean" antfile="${sca.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.extension.ws">
-    <ant target="clean" antfile="${ws.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/extensions/cpp/build.xml b/cpp/sca/runtime/extensions/cpp/build.xml
deleted file mode 100644
index b7eeb66855..0000000000
--- a/cpp/sca/runtime/extensions/cpp/build.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?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 name="TuscanyScaNative_extension_cpp" default="all" basedir="../../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="osoa.dir"       value="osoa/sca"/>
-  <property name="cpp.core.dir"   value="tuscany/sca/cpp"/>
-  <property name="cpp.model.dir"  value="tuscany/sca/cpp/model"/>
-  <property name="xsd.dir"        value="xsd"/>
-
-  <property name="this.dir"           location="${basedir}/runtime/extensions/cpp"/>
-  <property name="this.src.dir"       location="${this.dir}/src"/>
-  <property name="osoa.abs.dir"       location="${this.src.dir}/${osoa.dir}"/>
-  <property name="cpp.core.abs.dir"   location="${this.src.dir}/${cpp.core.dir}"/>
-  <property name="cpp.model.abs.dir"  location="${this.src.dir}/${cpp.model.dir}"/>
-  <property name="lib.dir"            location="${this.src.dir}/.libs"/>
-  <property name="xsd.abs.dir"        location="${this.dir}/${xsd.dir}"/>
-  <property name="scagen.abs.dir"     location="${this.dir}/tools/scagen"/>
-
-  <property name="tuscany.cpp.extension.lib"   value="tuscany_sca_cpp"/>
-  <property name="cpp.extension.install.dir"   location="${tuscanySCA.install.dir}/extensions/cpp"/>
-
-  <!--
-    All the cpp and header files per subdirectory
-    New classes should be added to these properties
-  -->
-
-  <property
-    name="osoa.cpp.files"
-    value="ComponentContext.cpp CompositeContext.cpp"/>
-  <property
-    name="osoa.h.files"
-    value="ComponentContext.h
-           CompositeContext.h
-           export.h
-           sca.h
-           ServiceRuntimeException.h"/>
-
-  <property
-    name="cpp.core.cpp.files"
-    value="ComponentContextImpl.cpp
-           CompositeContextImpl.cpp
-           CPPExtension.cpp
-           CPPImplementationExtension.cpp
-           CPPInterfaceExtension.cpp
-           CPPServiceProxy.cpp
-           CPPServiceWrapper.cpp
-           TuscanyRuntime.cpp"/>
-  <property
-    name="cpp.core.h.files"
-    value="ComponentContextImpl.h
-           CompositeContextImpl.h
-           CPPExtension.h
-           CPPImplementationExtension.h
-           CPPInterfaceExtension.h
-           CPPServiceProxy.h
-           CPPServiceWrapper.h
-           TuscanyRuntime.h"/>
-
-  <property
-    name="cpp.model.cpp.files"
-    value="CPPImplementation.cpp
-           CPPInterface.cpp
-           CPPReferenceBinding.cpp
-           CPPServiceBinding.cpp"/>
-  <property
-    name="cpp.model.h.files"
-    value="CPPImplementation.h
-           CPPInterface.h
-           CPPReferenceBinding.h
-           CPPServiceBinding.h"/>
-
-  <property
-    name="xsd.files"
-    value="sca-implementation-cpp.xsd
-           sca-interface-cpp.xsd"/>
-  <!--
-    Public targets
-  -->
-  <target name="all" description="Compile, link, and install all TuscanyScaNative cpp extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <!-- TODO is tools/scagen included? I thought it moved to <root>/tools -->
-
-  <target name="build" description="Compile and link all TuscanyScaNative cpp extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative cpp extension source code">
-    <antcall target="compile.cpp.osoa"/>
-    <antcall target="compile.cpp.core"/>
-    <antcall target="compile.cpp.model"/>
-    <ant target="scagen.jar" antfile="${scagen.abs.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="link" description="Link all TuscanyScaNative cpp extension source code">
-    <cpp-link
-        outfile="${tuscany.cpp.extension.lib}"
-        outdir="${lib.dir}"
-        indir="${lib.dir}"
-        infiles="*${object.ext}"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative cpp extension libraries and headers">
-    <antcall target="install.cpp.osoa"/>
-    <antcall target="install.cpp.core"/>
-    <antcall target="install.cpp.model"/>
-    <antcall target="install.xsd"/>
-    <cpp-install-lib
-        lib="${tuscany.cpp.extension.lib}"
-        srcdir="${lib.dir}"
-        destrootdir="${cpp.extension.install.dir}"/>
-    <cpp-symlink
-        linkdir="${cpp.extension.install.dir}/lib"
-        link="${lib.prefix}${tuscany.cpp.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${tuscany.cpp.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${cpp.extension.install.dir}/module"
-        link="${lib.prefix}${tuscany.cpp.extension.lib}${lib.ext}"
-        resourcedir="${cpp.extension.install.dir}/lib"
-        resource="${lib.prefix}${tuscany.cpp.extension.lib}${lib.ext}"/>
-    <ant target="install" antfile="${scagen.abs.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative cpp extension compiled source code">
-    <antcall target="clean.cpp.osoa"/>
-    <antcall target="clean.cpp.core"/>
-    <antcall target="clean.cpp.model"/>
-    <antcall target="clean.xsd"/>
-    <delete dir="${lib.dir}" quiet="true"/>
-    <cpp-clean-lib
-    	lib="${tuscany.cpp.extension.lib}"
-        librootdir="${cpp.extension.install.dir}"/>
-    <cpp-clean-files
-        dir="${cpp.extension.install.dir}/module"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${cpp.extension.install.dir}/include"
-        rmdir="true"/>
-  	<ant target="clean" antfile="${scagen.abs.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.cpp.osoa">
-    <cpp-compile
-        srcdir="${osoa.abs.dir}"
-        objdir="${lib.dir}"
-        infiles="${osoa.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_CPP_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.cpp.core">
-    <cpp-compile
-        srcdir="${cpp.core.abs.dir}"
-        objdir="${lib.dir}"
-        infiles="${cpp.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_CPP_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.cpp.model">
-    <cpp-compile
-        srcdir="${cpp.model.abs.dir}"
-        objdir="${lib.dir}"
-        infiles="${cpp.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_CPP_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.cpp.osoa">
-    <cpp-install-files
-        srcdir="${osoa.abs.dir}"
-        files="${osoa.h.files}"
-        destdir="${cpp.extension.install.dir}/include/${osoa.dir}"/>
-  </target>
-
-  <target name="install.cpp.core">
-    <cpp-install-files
-        srcdir="${cpp.core.abs.dir}"
-        files="${cpp.core.h.files}"
-        destdir="${cpp.extension.install.dir}/include/${cpp.core.dir}"/>
-  </target>
-
-  <target name="install.cpp.model">
-    <cpp-install-files
-        srcdir="${cpp.model.abs.dir}"
-        files="${cpp.model.h.files}"
-        destdir="${cpp.extension.install.dir}/include/${cpp.model.dir}"/>
-  </target>
-
-  <target name="install.xsd">
-    <cpp-install-files
-        srcdir="${xsd.abs.dir}"
-        files="${xsd.files}"
-        destdir="${cpp.extension.install.dir}/${xsd.dir}"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.cpp.osoa">
-    <cpp-clean-files
-        dir="${cpp.extension.install.dir}/include/${osoa.dir}"
-        rmdir="true"/>
-  </target>
-
-  <target name="clean.cpp.core">
-    <cpp-clean-files
-        dir="${cpp.extension.install.dir}/include/${cpp.core.dir}"
-        rmdir="true"/>
-  </target>
-
-  <target name="clean.cpp.model">
-    <cpp-clean-files
-        dir="${cpp.extension.install.dir}/include/${cpp.model.dir}"
-        rmdir="true"/>
-  </target>
-
-  <target name="clean.xsd">
-    <cpp-clean-files
-        dir="${cpp.extension.install.dir}/${xsd.dir}"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj b/cpp/sca/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
deleted file mode 100644
index 1a8f668c19..0000000000
--- a/cpp/sca/runtime/extensions/php/VSExpress/tuscany_sca_php.vcproj
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="tuscany_sca_php"

-	ProjectGUID="{28E45334-1F59-45CB-93EE-FB787D81B6D2}"

-	RootNamespace="tuscany_sca_php"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="2"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../../runtime/extensions/php/src;../../../deploy/include;&quot;$(TUSCANY_SDOCPP)/include&quot;;&quot;$(PHP_HOME)/main&quot;;&quot;$(PHP_HOME)/sapi/embed&quot;;&quot;$(PHP_HOME)&quot;;&quot;$(PHP_HOME)/zend&quot;;&quot;$(PHP_HOME)/TSRM&quot;;&quot;$(PHP_SCA_SDO_HOME)&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_PHP_EXPORTS;ZEND_WIN32;PHP_WIN32;ZTS;ZEND_DEBUG=0"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				DisableLanguageExtensions="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib php5embed.lib php_sdo.lib"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(PHP_HOME)\Debug_Ts"

-				IgnoreDefaultLibraryNames="MSVCRT"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="..\..\..\runtime\extensions\php\deploy.bat ..\..\..\ Debug"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_PHP_EXPORTS"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="model"

-			>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPImplementation.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPImplementation.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPInterface.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPInterface.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPReferenceBinding.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPReferenceBinding.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPServiceBinding.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\model\PHPServiceBinding.h"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\export.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\php_sca.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPExtension.cpp"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPExtension.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPImplementationExtension.cpp"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPImplementationExtension.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPInterfaceExtension.cpp"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPInterfaceExtension.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPServiceProxy.cpp"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPServiceProxy.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPServiceWrapper.cpp"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\PHPServiceWrapper.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\sca.cpp"

-			>

-		</File>

-		<File

-			RelativePath="..\..\..\runtime\extensions\php\src\tuscany\sca\php\sca.h"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/runtime/extensions/php/build.xml b/cpp/sca/runtime/extensions/php/build.xml
deleted file mode 100644
index c16af17157..0000000000
--- a/cpp/sca/runtime/extensions/php/build.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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 name="TuscanyScaNative_extension_php" default="all" basedir="../../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"         location="${basedir}/runtime/extensions/php"/>
-  <property name="xsd.dir"          location="${this.dir}/xsd"/>
-  <property name="php.core.dir"     location="${this.dir}/src/tuscany/sca/php"/>
-  <property name="php.model.dir"    location="${this.dir}/src/tuscany/sca/php/model"/>
-  <property name="lib.dir"          location="${this.dir}/src/.libs"/>
-
-  <property name="php.extension.lib"          value="tuscany_sca_php"/>
-  <property name="php.extension.install.dir"  location="${tuscanySCA.install.dir}/extensions/php"/>
-
-  <!--
-    All the cpp files per subdirectory
-    New classes should be added to these properties
-  -->
-
-  <property
-    name="php.core.cpp.files"
-    value="PHPExtension.cpp
-           PHPImplementationExtension.cpp
-           PHPInterfaceExtension.cpp
-           PHPServiceProxy.cpp
-           PHPServiceWrapper.cpp
-           sca.cpp"/>
-
-  <property
-    name="php.model.cpp.files"
-    value="PHPImplementation.cpp
-           PHPInterface.cpp
-           PHPReferenceBinding.cpp
-           PHPServiceBinding.cpp"/>
-
-  <property
-    name="xsd.files"
-    value="sca-implementation-php.xsd"/>
-
-  <!--
-    Public targets
-  -->
-  <target name="all" description="Compile, link, and install all TuscanyScaNative php extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="Compile and link all TuscanyScaNative php extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative php extension source code">
-    <antcall target="compile.php.core"/>
-    <antcall target="compile.php.model"/>
-  </target>
-
-  <target name="link" depends="check.php" if="enable_php"
-          description="Link all TuscanyScaNative php extension source code">
-    <cpp-link
-        outfile="${php.extension.lib}"
-        outdir="${lib.dir}"
-        indir="${lib.dir}"
-        infiles="*${object.ext}">
-      <custom-ld-elements>
-        <libset dir="${php.lib.dir}" libs="php5"/>
-        <libset dir="${php.sca.sdo.lib.dir}" libs="sdo"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative php extension libraries and headers">
-    <antcall target="install.php.core"/>
-    <antcall target="install.php.xsd"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative php extension compiled source code">
-    <antcall target="clean.php.core"/>
-    <antcall target="clean.php.xsd"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.php.core" depends="check.php" if="enable_php">
-    <cpp-compile
-        srcdir="${php.core.dir}"
-        objdir="${lib.dir}"
-        infiles="${php.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${sdo.include.dir}"/>
-        <includepath path="${this.dir}/src"/>
-        <includepath path="${php.include.dir}"/>
-        <includepath path="${php.include.dir}/main"/>
-        <includepath path="${php.include.dir}/sapi/embed"/>
-        <includepath path="${php.include.dir}/TSRM"/>
-        <includepath path="${php.include.dir}/Zend"/>
-        <includepath path="${php.sca.sdo.include.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_PHP_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.php.model" depends="check.php" if="enable_php">
-    <cpp-compile
-        srcdir="${php.model.dir}"
-        objdir="${lib.dir}"
-        infiles="${php.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/src"/>
-        <includepath path="${php.include.dir}"/>
-        <includepath path="${php.include.dir}/TSRM"/>
-        <defineset if="windows" define="TUSCANY_SCA_PHP_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.php.core" depends="check.php" if="enable_php">
-    <cpp-install-lib
-        lib="${php.extension.lib}"
-        srcdir="${lib.dir}"
-        destrootdir="${php.extension.install.dir}"/>
-    <cpp-symlink
-        linkdir="${php.extension.install.dir}/lib"
-        link="${lib.prefix}${php.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${php.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${php.extension.install.dir}/module"
-        link="${lib.prefix}${php.extension.lib}${lib.ext}"
-        resourcedir="${php.extension.install.dir}/lib"
-        resource="${lib.prefix}${php.extension.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.php.xsd" depends="check.php" if="enable_php">
-    <cpp-install-files
-        files="${xsd.files}"
-        srcdir="${xsd.dir}"
-        destdir="${php.extension.install.dir}/xsd"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.php.core">
-    <cpp-clean-lib
-    	lib="${php.extension.lib}"
-        librootdir="${php.extension.install.dir}"/>
-    <cpp-clean-files
-        dir="${php.extension.install.dir}/module"
-        rmdir="true"/>
-    <delete dir="${lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.php.xsd">
-    <cpp-clean-files
-        dir="${php.extension.install.dir}/xsd"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/extensions/python/build.xml b/cpp/sca/runtime/extensions/python/build.xml
deleted file mode 100644
index 59598dada5..0000000000
--- a/cpp/sca/runtime/extensions/python/build.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?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 name="TuscanyScaNative_extension_python" default="all" basedir="../../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"              location="${basedir}/runtime/extensions/python"/>
-  <property name="this.src.dir"          location="${basedir}/runtime/extensions/python/src"/>
-  <property name="python.xsd.dir"        location="${this.dir}/xsd"/>
-  <property name="python.core.dir"       location="${this.src.dir}/tuscany/sca/python"/>
-  <property name="python.model.dir"      location="${this.src.dir}/tuscany/sca/python/model"/>
-  <property name="lib.dir"               location="${this.src.dir}/.libs"/>
-  <property name="python.extension.lib"  value="tuscany_sca_python"/>
-  <property name="python.extension.install.dir"
-            location="${tuscanySCA.install.dir}/extensions/python"/>
-
-  <!--
-    All the cpp files per subdirectory
-    New classes should be added to these properties
-  -->
-  <property
-    name="python.core.cpp.files"
-    value="PythonExtension.cpp
-           PythonImplementationExtension.cpp
-           PythonInterfaceExtension.cpp
-           PythonServiceProxy.cpp
-           PythonServiceWrapper.cpp
-           sca_module.cpp"/>
-
-  <property
-    name="python.model.cpp.files"
-    value="PythonImplementation.cpp
-           PythonInterface.cpp
-           PythonReferenceBinding.cpp
-           PythonServiceBinding.cpp"/>
-
-  <property
-    name="python.xsd.files"
-    value="sca-implementation-python.xsd
-           sca-interface-python.xsd"/>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-      description="Compile, link, and install all TuscanyScaNative python extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="Compile and link all TuscanyScaNative python extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative python extension source code">
-    <antcall target="compile.python.core"/>
-    <antcall target="compile.python.model"/>
-  </target>
-
-  <target name="link" depends="check.python" if="enable_python"
-          description="Link all TuscanyScaNative python extension source code">
-    <cpp-link
-        outfile="${python.extension.lib}"
-        outdir="${lib.dir}"
-        indir="${lib.dir}"
-        infiles="*${object.ext}">
-      <custom-ld-elements>
-        <libset dir="${python.lib.dir}" libs="${python.version}"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative python extension libraries and headers">
-    <antcall target="install.python.core"/>
-    <antcall target="install.python.xsd"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative python extension compiled source code">
-    <antcall target="clean.python.core"/>
-    <antcall target="clean.python.xsd"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.python.core" depends="check.python" if="enable_python">
-    <cpp-compile
-        srcdir="${python.core.dir}"
-        objdir="${lib.dir}"
-        infiles="${python.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <includepath path="${python.include.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_PYTHON_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.python.model" depends="check.python" if="enable_python">
-    <cpp-compile
-        srcdir="${python.model.dir}"
-        objdir="${lib.dir}"
-        infiles="${python.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <includepath path="${python.include.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_PYTHON_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.python.core" depends="check.python" if="enable_python">
-    <cpp-install-lib
-        lib="${python.extension.lib}"
-        srcdir="${lib.dir}"
-        destrootdir="${python.extension.install.dir}"/>
-    <cpp-symlink
-        linkdir="${python.extension.install.dir}/lib"
-        link="${lib.prefix}${python.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${python.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${python.extension.install.dir}/module"
-        link="${lib.prefix}${python.extension.lib}${lib.ext}"
-        resourcedir="${python.extension.install.dir}/lib"
-        resource="${lib.prefix}${python.extension.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.python.xsd" depends="check.python" if="enable_python">
-    <cpp-install-files
-        files="${python.xsd.files}"
-        srcdir="${python.xsd.dir}"
-        destdir="${python.extension.install.dir}/xsd"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.python.core">
-    <cpp-clean-lib
-    	lib="${python.extension.lib}"
-        librootdir="${python.extension.install.dir}"/>
-    <cpp-clean-files
-        dir="${python.extension.install.dir}/module"
-        rmdir="true"/>
-    <delete dir="${lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.python.xsd">
-    <cpp-clean-files
-        dir="${python.extension.install.dir}/xsd"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/extensions/rest/build.xml b/cpp/sca/runtime/extensions/rest/build.xml
deleted file mode 100644
index 277a1bcafd..0000000000
--- a/cpp/sca/runtime/extensions/rest/build.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?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 name="TuscanyScaNative_extension_rest" default="all" basedir="../../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"              location="${basedir}/runtime/extensions/rest"/>
-  <property name="interface.dir"         value="interface/src"/>
-  <property name="reference.dir"         value="reference/curl/src"/>
-  <property name="service.dir"           value="service/httpd/src"/>
-  <property name="rest.dir"              value="tuscany/sca/rest"/>
-  <property name="xsd.dir"               location="${this.dir}/xsd"/>
-  <property name="interface.core.dir"    location="${this.dir}/${interface.dir}/${rest.dir}"/>
-  <property name="interface.model.dir"   location="${this.dir}/${interface.dir}/${rest.dir}/model"/>
-  <property name="reference.core.dir"    location="${this.dir}/${reference.dir}/${rest.dir}"/>
-  <property name="reference.model.dir"   location="${this.dir}/${reference.dir}/${rest.dir}/model"/>
-  <property name="service.core.dir"      location="${this.dir}/${service.dir}/${rest.dir}"/>
-  <property name="service.model.dir"     location="${this.dir}/${service.dir}/${rest.dir}/model"/>
-  <property name="interface.lib.dir"     location="${this.dir}/${interface.dir}/.libs"/>
-  <property name="reference.lib.dir"     location="${this.dir}/${reference.dir}/.libs"/>
-  <property name="service.lib.dir"       location="${this.dir}/${service.dir}/.libs"/>
-
-  <property name="interface.extension.lib"    value="tuscany_sca_rest_interface"/>
-  <property name="reference.extension.lib"    value="tuscany_sca_rest_reference"/>
-  <property name="service.extension.lib"      value="tuscany_sca_rest_service"/>
-  <property name="service.mod.lib"            value="tuscany_sca_mod_rest"/>
-  <property name="rest.extension.install.dir" location="${tuscanySCA.install.dir}/extensions/rest"/>
-
-  <!--
-    All the cpp files per subdirectory
-    New classes should be added to these properties
-  -->
-
-  <property
-    name="interface.core.cpp.files"
-    value="RESTInterfaceExtension.cpp"/>
-
-  <property
-    name="interface.model.cpp.files"
-    value="RESTInterface.cpp"/>
-
-  <property
-    name="reference.core.cpp.files"
-    value="RESTServiceBindingExtension.cpp
-           RESTServiceWrapper.cpp"/>
-
-  <property
-    name="reference.model.cpp.files"
-    value="RESTServiceBinding.cpp"/>
-
-  <property
-    name="service.core.cpp.files"
-    value="ModREST.cpp
-           RESTReferenceBindingExtension.cpp
-           RESTServiceProxy.cpp"/>
-
-  <property
-    name="service.model.cpp.files"
-    value="RESTReferenceBinding.cpp"/>
-
-  <property
-    name="service.core.object.files"
-    value="RESTReferenceBindingExtension${object.ext}
-           RESTReferenceBinding${object.ext}
-           RESTServiceProxy${object.ext}"/>
-
-  <property
-    name="service.mod.object.files"
-    value="ModREST${object.ext}"/>
-
-  <property
-    name="xsd.files"
-    value="sca-binding-rest.xsd
-           sca-interface-rest.xsd"/>
-  <!--
-    Public targets
-  -->
-  <target name="all" description="Compile, link, and install all TuscanyScaNative rest extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="Compile and link all TuscanyScaNative rest extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative rest extension source code">
-    <antcall target="compile.rest.interface.core"/>
-    <antcall target="compile.rest.interface.model"/>
-    <antcall target="compile.rest.reference.core"/>
-    <antcall target="compile.rest.reference.model"/>
-    <antcall target="compile.rest.service.core"/>
-    <antcall target="compile.rest.service.model"/>
-  </target>
-
-  <target name="link" description="Link all TuscanyScaNative rest extension source code">
-    <antcall target="link.rest.interface"/>
-    <antcall target="link.rest.reference"/>
-    <antcall target="link.rest.service"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative rest extension libraries and headers">
-    <antcall target="install.rest.interface"/>
-    <antcall target="install.rest.reference"/>
-    <antcall target="install.rest.service"/>
-    <antcall target="install.rest.xsd"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative rest extension compiled source code">
-    <antcall target="clean.rest.interface"/>
-    <antcall target="clean.rest.reference"/>
-    <antcall target="clean.rest.service"/>
-    <antcall target="clean.rest.xsd"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.rest.interface.core" depends="check.rest" if="enable_rest">
-    <cpp-compile
-        srcdir="${interface.core.dir}"
-        objdir="${interface.lib.dir}"
-        infiles="${interface.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${interface.dir}"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.rest.interface.model" depends="check.rest" if="enable_rest">
-    <cpp-compile
-        srcdir="${interface.model.dir}"
-        objdir="${interface.lib.dir}"
-        infiles="${interface.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${interface.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_REST_INTERFACE_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.rest.reference.core" depends="check.rest" if="enable_rest">
-    <cpp-compile
-        srcdir="${reference.core.dir}"
-        objdir="${reference.lib.dir}"
-        infiles="${reference.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${interface.dir}"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.rest.reference.model" depends="check.rest" if="enable_rest">
-    <cpp-compile
-        srcdir="${reference.model.dir}"
-        objdir="${reference.lib.dir}"
-        infiles="${reference.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${reference.dir}"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.rest.service.core" depends="check.rest" if="enable_rest">
-    <cpp-compile
-        srcdir="${service.core.dir}"
-        objdir="${service.lib.dir}"
-        infiles="${service.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${rest.httpd.include.dir}"/>
-        <includepath path="${this.dir}/${interface.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_REST_SERVICE_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.rest.service.model" depends="check.rest" if="enable_rest">
-    <cpp-compile
-        srcdir="${service.model.dir}"
-        objdir="${service.lib.dir}"
-        infiles="${service.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${service.dir}"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- link -->
-
-  <target name="link.rest.interface" depends="check.rest" if="enable_rest">
-    <cpp-link
-        outfile="${interface.extension.lib}"
-        outdir="${interface.lib.dir}"
-        indir="${interface.lib.dir}"
-        infiles="*${object.ext}"/>
-  </target>
-
-  <target name="link.rest.reference" depends="check.rest" if="enable_rest">
-    <cpp-link
-        outfile="${reference.extension.lib}"
-        outdir="${reference.lib.dir}"
-        indir="${reference.lib.dir}"
-        infiles="*${object.ext}">
-      <custom-ld-elements>
-        <libset dir="${interface.lib.dir}" libs="${interface.extension.lib}"/>
-        <libset dir="${rest.curl.lib.dir}" libs="curl"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-  <target name="link.rest.service" depends="check.rest" if="enable_rest">
-    <cpp-link
-        outfile="${service.extension.lib}"
-        outdir="${service.lib.dir}"
-        indir="${service.lib.dir}"
-        infiles="${service.core.object.files}">
-      <custom-ld-elements>
-        <libset dir="${interface.lib.dir}" libs="${interface.extension.lib}"/>
-      </custom-ld-elements>
-    </cpp-link>
-    <cpp-link
-        outfile="${service.mod.lib}"
-        outdir="${service.lib.dir}"
-        indir="${service.lib.dir}"
-        infiles="${service.mod.object.files}">
-      <custom-ld-elements>
-        <libset dir="${service.lib.dir}" libs="${service.extension.lib}"/>
-        <libset dir="${interface.lib.dir}" libs="${interface.extension.lib}"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.rest.interface" depends="check.rest" if="enable_rest">
-    <cpp-install-lib
-        lib="${interface.extension.lib}"
-        srcdir="${interface.lib.dir}"
-        destrootdir="${rest.extension.install.dir}/interface"/>
-    <cpp-symlink
-        linkdir="${rest.extension.install.dir}/interface/lib"
-        link="${lib.prefix}${interface.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${interface.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${rest.extension.install.dir}/interface/module"
-        link="${lib.prefix}${interface.extension.lib}${lib.ext}"
-        resourcedir="${rest.extension.install.dir}/interface/lib"
-        resource="${lib.prefix}${interface.extension.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.rest.reference" depends="check.rest" if="enable_rest">
-    <cpp-install-lib
-        lib="${reference.extension.lib}"
-        srcdir="${reference.lib.dir}"
-        destrootdir="${rest.extension.install.dir}/reference"/>
-    <cpp-symlink
-        linkdir="${rest.extension.install.dir}/reference/lib"
-        link="${lib.prefix}${reference.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${reference.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${rest.extension.install.dir}/reference/module"
-        link="${lib.prefix}${reference.extension.lib}${lib.ext}"
-        resourcedir="${rest.extension.install.dir}/reference/lib"
-        resource="${lib.prefix}${reference.extension.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.rest.service" depends="check.rest" if="enable_rest">
-      <!-- install and link tuscany_sca_rest_service library -->
-    <cpp-install-lib
-        lib="${service.extension.lib}"
-        srcdir="${service.lib.dir}"
-        destrootdir="${rest.extension.install.dir}/service"/>
-    <cpp-symlink
-        linkdir="${rest.extension.install.dir}/service/lib"
-        link="${lib.prefix}${service.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${service.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${rest.extension.install.dir}/service/module"
-        link="${lib.prefix}${service.extension.lib}${lib.ext}"
-        resourcedir="${rest.extension.install.dir}/service/lib"
-        resource="${lib.prefix}${service.extension.lib}${lib.ext}"/>
-
-      <!-- install and link tuscany_sca_mod_rest library -->
-    <cpp-install-lib
-        lib="${service.mod.lib}"
-        srcdir="${service.lib.dir}"
-        destrootdir="${rest.extension.install.dir}/service"/>
-    <cpp-symlink
-        linkdir="${rest.extension.install.dir}/service/lib"
-        link="${lib.prefix}${service.mod.lib}${lib.ext}"
-        resource="${lib.prefix}${service.mod.lib}${lib.ext}${tuscanySCA.library.version}"/>
-  </target>
-
-  <target name="install.rest.xsd" depends="check.rest" if="enable_rest">
-    <cpp-install-files
-        files="${xsd.files}"
-        srcdir="${xsd.dir}"
-        destdir="${rest.extension.install.dir}/xsd"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.rest.interface">
-    <cpp-clean-lib
-    	lib="${interface.extension.lib}"
-        librootdir="${rest.extension.install.dir}/interface"/>
-    <cpp-clean-files
-        dir="${rest.extension.install.dir}/interface/module"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${rest.extension.install.dir}/interface"
-        rmdir="true"/>
-    <delete dir="${interface.lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.rest.reference">
-    <cpp-clean-lib
-    	lib="${reference.extension.lib}"
-        librootdir="${rest.extension.install.dir}/reference"/>
-    <cpp-clean-files
-        dir="${rest.extension.install.dir}/reference/module"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${rest.extension.install.dir}/reference"
-        rmdir="true"/>
-    <delete dir="${reference.lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.rest.service">
-    <cpp-clean-lib
-    	lib="${service.extension.lib}"
-        librootdir="${rest.extension.install.dir}/service"/>
-    <cpp-clean-files
-        dir="${rest.extension.install.dir}/service/module"
-        rmdir="true"/>
-    <cpp-clean-lib
-    	lib="${service.mod.lib}"
-        librootdir="${rest.extension.install.dir}/service"/>
-    <delete dir="${service.lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.rest.xsd">
-    <cpp-clean-files
-        dir="${rest.extension.install.dir}/xsd"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/extensions/ruby/build.xml b/cpp/sca/runtime/extensions/ruby/build.xml
deleted file mode 100644
index 414ff9bbf8..0000000000
--- a/cpp/sca/runtime/extensions/ruby/build.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?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 name="TuscanyScaNative_extension_ruby" default="all" basedir="../../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"            location="${basedir}/runtime/extensions/ruby"/>
-  <property name="this.src.dir"        location="${basedir}/runtime/extensions/ruby/src"/>
-  <property name="ruby.xsd.dir"        location="${this.dir}/xsd"/>
-  <property name="ruby.core.dir"       location="${this.src.dir}/tuscany/sca/ruby"/>
-  <property name="ruby.model.dir"      location="${this.src.dir}/tuscany/sca/ruby/model"/>
-  <property name="ruby.extension.dir"  location="${this.dir}/extension/src"/>
-  <property name="lib.extension.dir"   location="${this.dir}/extension/.libs"/>
-  <property name="lib.dir"             location="${this.src.dir}/.libs"/>
-  <property name="ruby.core.lib"       value="tuscany_sca_ruby_lang"/>
-  <property name="ruby.extension.lib"  value="tuscany_sca_ruby"/>
-  <property name="ruby.install.dir"    location="${tuscanySCA.install.dir}/extensions/ruby"/>
-
-  <!--
-    All the cpp files per subdirectory
-    New classes should be added to these properties
-  -->
-  <property
-    name="ruby.core.cpp.files"
-    value="RubyCompositeContext.cpp
-           RubyExtension.cpp
-           RubyImplementationExtension.cpp
-           RubyServiceProxy.cpp
-           RubyServiceWrapper.cpp"/>
-
-  <property
-    name="ruby.model.cpp.files"
-    value="RubyImplementation.cpp
-           RubyReferenceBinding.cpp
-           RubyServiceBinding.cpp"/>
-
-  <property
-    name="ruby.extension.cpp.files"
-    value="Extension.cpp"/>
-
-  <property
-    name="ruby.xsd.files"
-    value="sca-implementation-ruby.xsd"/>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-      description="Compile, link, and install all TuscanyScaNative ruby extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="Compile and link all TuscanyScaNative ruby extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative ruby extension source code">
-    <antcall target="compile.ruby.core"/>
-    <antcall target="compile.ruby.model"/>
-    <antcall target="compile.ruby.extension"/>
-  </target>
-
-  <target name="link" description="Link all TuscanyScaNative ruby extension source code">
-    <antcall target="link.ruby.core"/>
-    <antcall target="link.ruby.extension"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative ruby extension libraries and headers">
-    <antcall target="install.ruby.core"/>
-    <antcall target="install.ruby.extension"/>
-    <antcall target="install.ruby.xsd"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative ruby extension compiled source code">
-    <antcall target="clean.ruby.core"/>
-    <antcall target="clean.ruby.extension"/>
-    <antcall target="clean.ruby.xsd"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.ruby.core" depends="check.ruby" if="enable_ruby">
-    <cpp-compile
-        srcdir="${ruby.core.dir}"
-        objdir="${lib.dir}"
-        infiles="${ruby.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <includepath path="${ruby.include.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_RUBY_LANG_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.ruby.model" depends="check.ruby" if="enable_ruby">
-    <cpp-compile
-        srcdir="${ruby.model.dir}"
-        objdir="${lib.dir}"
-        infiles="${ruby.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <includepath path="${ruby.include.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_RUBY_LANG_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.ruby.extension" depends="check.ruby" if="enable_ruby">
-    <cpp-compile
-        srcdir="${ruby.extension.dir}"
-        objdir="${lib.extension.dir}"
-        infiles="${ruby.extension.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.src.dir}"/>
-        <includepath path="${ruby.include.dir}"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- link -->
-
-  <target name="link.ruby.core" depends="check.ruby" if="enable_ruby">
-    <cpp-link
-        outfile="${ruby.core.lib}"
-        outdir="${lib.dir}"
-        indir="${lib.dir}"
-        infiles="*${object.ext}">
-      <custom-ld-elements>
-        <libset dir="${ruby.lib.dir}" libs="ruby"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-  <target name="link.ruby.extension" depends="check.ruby" if="enable_ruby">
-    <cpp-link
-        outfile="${ruby.extension.lib}"
-        outdir="${lib.extension.dir}"
-        indir="${lib.extension.dir}"
-        infiles="*${object.ext}"/>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.ruby.core" depends="check.ruby" if="enable_ruby">
-    <cpp-install-lib
-        lib="${ruby.core.lib}"
-        srcdir="${lib.dir}"
-        destrootdir="${ruby.install.dir}"/>
-    <cpp-symlink
-        linkdir="${ruby.install.dir}/lib"
-        link="${lib.prefix}${ruby.core.lib}${lib.ext}"
-        resource="${lib.prefix}${ruby.core.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${ruby.install.dir}/module"
-        link="${lib.prefix}${ruby.core.lib}${lib.ext}"
-        resourcedir="${ruby.install.dir}/lib"
-        resource="${lib.prefix}${ruby.core.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.ruby.extension" depends="check.ruby" if="enable_ruby">
-    <cpp-install-file
-        srcfile="${lib.prefix}${ruby.extension.lib}${lib.ext}"
-        destfile="${ruby.extension.lib}${lib.ext}"
-        srcdir="${lib.extension.dir}"
-        destdir="${ruby.install.dir}/lib"/>
-  </target>
-
-  <target name="install.ruby.xsd" depends="check.ruby" if="enable_ruby">
-    <cpp-install-files
-        files="${ruby.xsd.files}"
-        srcdir="${ruby.xsd.dir}"
-        destdir="${ruby.install.dir}/xsd"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.ruby.core">
-    <cpp-clean-lib
-    	lib="${ruby.core.lib}"
-        librootdir="${ruby.install.dir}"/>
-    <cpp-clean-files
-        dir="${ruby.install.dir}/module"
-        rmdir="true"/>
-    <delete dir="${lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.ruby.extension">
-    <cpp-clean-files
-        dir="${ruby.install.dir}/lib"
-        files="${ruby.extension.lib}${lib.ext}"
-        rmdir="true"/>
-    <delete dir="${lib.extension.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.ruby.xsd">
-    <cpp-clean-files
-        dir="${ruby.install.dir}/xsd"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/extensions/sca/build.xml b/cpp/sca/runtime/extensions/sca/build.xml
deleted file mode 100644
index e83ba9c15c..0000000000
--- a/cpp/sca/runtime/extensions/sca/build.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?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 name="TuscanyScaNative_extension_sca" default="all" basedir="../../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"              location="${basedir}/runtime/extensions/sca"/>
-  <property name="reference.dir"         value="reference/src"/>
-  <property name="service.dir"           value="service/src"/>
-  <property name="binding.dir"           value="tuscany/sca/binding"/>
-  <property name="xsd.dir"               location="${this.dir}/xsd"/>
-  <property name="reference.core.dir"    location="${this.dir}/${reference.dir}/${binding.dir}"/>
-  <property name="reference.model.dir"   location="${this.dir}/${reference.dir}/${binding.dir}/model"/>
-  <property name="service.core.dir"      location="${this.dir}/${service.dir}/${binding.dir}"/>
-  <property name="service.model.dir"     location="${this.dir}/${service.dir}/${binding.dir}/model"/>
-  <property name="reference.lib.dir"     location="${this.dir}/${reference.dir}/.libs"/>
-  <property name="service.lib.dir"       location="${this.dir}/${service.dir}/.libs"/>
-
-  <property name="reference.extension.lib"    value="tuscany_sca_binding_reference"/>
-  <property name="service.extension.lib"      value="tuscany_sca_binding_service"/>
-  <property name="sca.extension.install.dir"  location="${tuscanySCA.install.dir}/extensions/sca"/>
-
-  <!--
-    All the cpp files per subdirectory
-    New classes should be added to these properties
-  -->
-
-  <property
-    name="reference.core.cpp.files"
-    value="SCAServiceBindingExtension.cpp"/>
-
-  <property
-    name="reference.model.cpp.files"
-    value="SCAServiceBinding.cpp"/>
-
-  <property
-    name="service.core.cpp.files"
-    value="SCAReferenceBindingExtension.cpp"/>
-
-  <property
-    name="service.model.cpp.files"
-    value="SCAReferenceBinding.cpp"/>
-
-  <property
-    name="xsd.files"
-    value="sca-binding-sca.xsd"/>
-  <!--
-    Public targets
-  -->
-  <target name="all" description="Compile, link, and install all TuscanyScaNative sca extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="Compile and link all TuscanyScaNative sca extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative sca extension source code">
-    <antcall target="compile.sca.reference.core"/>
-    <antcall target="compile.sca.reference.model"/>
-    <antcall target="compile.sca.service.core"/>
-    <antcall target="compile.sca.service.model"/>
-  </target>
-
-  <target name="link" description="Link all TuscanyScaNative sca extension source code">
-    <antcall target="link.sca.reference"/>
-    <antcall target="link.sca.service"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative sca extension libraries and headers">
-    <antcall target="install.sca.reference"/>
-    <antcall target="install.sca.service"/>
-    <antcall target="install.sca.xsd"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative sca extension compiled source code">
-    <antcall target="clean.sca.reference"/>
-    <antcall target="clean.sca.service"/>
-    <antcall target="clean.sca.xsd"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.sca.reference.core" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${reference.core.dir}"
-        objdir="${reference.lib.dir}"
-        infiles="${reference.core.cpp.files}"/>
-  </target>
-
-  <target name="compile.sca.reference.model" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${reference.model.dir}"
-        objdir="${reference.lib.dir}"
-        infiles="${reference.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${reference.dir}"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.sca.service.core" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${service.core.dir}"
-        objdir="${service.lib.dir}"
-        infiles="${service.core.cpp.files}"/>
-  </target>
-
-  <target name="compile.sca.service.model" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${service.model.dir}"
-        objdir="${service.lib.dir}"
-        infiles="${service.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${service.dir}"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- link -->
-
-  <target name="link.sca.reference" depends="check.ws" if="enable_ws">
-    <cpp-link
-        outfile="${reference.extension.lib}"
-        outdir="${reference.lib.dir}"
-        indir="${reference.lib.dir}"
-        infiles="*${object.ext}">
-      <custom-ld-elements>
-        <libset dir="${sdo.lib.dir}" libs="tuscany_sdo_axiom"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-  <target name="link.sca.service" depends="check.ws" if="enable_ws">
-    <cpp-link
-        outfile="${service.extension.lib}"
-        outdir="${service.lib.dir}"
-        indir="${service.lib.dir}"
-        infiles="*${object.ext}">
-      <custom-ld-elements>
-        <libset dir="${sdo.lib.dir}" libs="tuscany_sdo_axiom"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.sca.reference" depends="check.ws" if="enable_ws">
-    <cpp-install-lib
-        lib="${reference.extension.lib}"
-        srcdir="${reference.lib.dir}"
-        destrootdir="${sca.extension.install.dir}/reference"/>
-    <cpp-symlink
-        linkdir="${sca.extension.install.dir}/reference/lib"
-        link="${lib.prefix}${reference.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${reference.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${sca.extension.install.dir}/reference/module"
-        link="${lib.prefix}${reference.extension.lib}${lib.ext}"
-        resourcedir="${sca.extension.install.dir}/reference/lib"
-        resource="${lib.prefix}${reference.extension.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.sca.service" depends="check.ws" if="enable_ws">
-    <cpp-install-lib
-        lib="${service.extension.lib}"
-        srcdir="${service.lib.dir}"
-        destrootdir="${sca.extension.install.dir}/service"/>
-    <cpp-symlink
-        linkdir="${sca.extension.install.dir}/service/lib"
-        link="${lib.prefix}${service.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${service.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${sca.extension.install.dir}/service/module"
-        link="${lib.prefix}${service.extension.lib}${lib.ext}"
-        resourcedir="${sca.extension.install.dir}/service/lib"
-        resource="${lib.prefix}${service.extension.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.sca.xsd" depends="check.ws" if="enable_ws">
-    <cpp-install-files
-        files="${xsd.files}"
-        srcdir="${xsd.dir}"
-        destdir="${sca.extension.install.dir}/xsd"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.sca.reference">
-    <cpp-clean-lib
-    	lib="${reference.extension.lib}"
-        librootdir="${sca.extension.install.dir}/reference"/>
-    <cpp-clean-files
-        dir="${sca.extension.install.dir}/reference/module"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${sca.extension.install.dir}/reference"
-        rmdir="true"/>
-    <delete dir="${reference.lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.sca.service">
-    <cpp-clean-lib
-    	lib="${service.extension.lib}"
-        librootdir="${sca.extension.install.dir}/service"/>
-    <cpp-clean-files
-        dir="${sca.extension.install.dir}/service/module"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${sca.extension.install.dir}/service"
-        rmdir="true"/>
-    <delete dir="${service.lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.sca.xsd">
-    <cpp-clean-files
-        dir="${sca.extension.install.dir}/xsd"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/runtime/extensions/ws/build.xml b/cpp/sca/runtime/extensions/ws/build.xml
deleted file mode 100644
index 2994ea5edb..0000000000
--- a/cpp/sca/runtime/extensions/ws/build.xml
+++ /dev/null
@@ -1,383 +0,0 @@
-<?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 name="TuscanyScaNative_extension_ws" default="all" basedir="../../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir"              location="${basedir}/runtime/extensions/ws"/>
-  <property name="reference.dir"         value="reference/axis2c/src"/>
-  <property name="service.dir"           value="service/axis2c/src"/>
-  <property name="ws.dir"                value="tuscany/sca/ws"/>
-  <property name="xsd.dir"               location="${this.dir}/xsd"/>
-  <property name="reference.core.dir"    location="${this.dir}/${reference.dir}/${ws.dir}"/>
-  <property name="reference.model.dir"   location="${this.dir}/${reference.dir}/${ws.dir}/model"/>
-  <property name="service.core.dir"      location="${this.dir}/${service.dir}/${ws.dir}"/>
-  <property name="service.model.dir"     location="${this.dir}/${service.dir}/${ws.dir}/model"/>
-  <property name="reference.lib.dir"     location="${this.dir}/${reference.dir}/.libs"/>
-  <property name="service.lib.dir"       location="${this.dir}/${service.dir}/.libs"/>
-
-  <property name="reference.extension.lib"    value="tuscany_sca_ws_reference"/>
-  <property name="service.extension.lib"      value="tuscany_sca_ws_service"/>
-  <property name="dispatcher.extension.lib"   value="tuscany_sca_ws_dispatcher"/>
-  <property name="ws.extension.install.dir"   location="${tuscanySCA.install.dir}/extensions/ws"/>
-
-  <!--
-    All the cpp files per subdirectory
-    New classes should be added to these properties
-  -->
-
-  <property
-    name="reference.core.cpp.files"
-    value="Axis2Client.cpp
-           WSServiceBindingExtension.cpp
-           WSServiceWrapper.cpp"/>
-
-  <property
-    name="reference.model.cpp.files"
-    value="WSServiceBinding.cpp"/>
-
-  <property
-    name="service.core.cpp.files"
-    value="Axis2Dispatcher.cpp
-           Axis2DispatcherModule.cpp
-           Axis2Service.cpp
-           Axis2Utils.cpp
-           WSReferenceBindingExtension.cpp
-           WSServiceProxy.cpp"/>
-
-  <property
-    name="service.model.cpp.files"
-    value="WSReferenceBinding.cpp"/>
-
-  <property
-    name="service.core.obj.files"
-    value="Axis2Service${object.ext}
-           Axis2Utils${object.ext}
-           WSReferenceBindingExtension${object.ext}
-           WSReferenceBinding${object.ext}
-           WSServiceProxy${object.ext}"/>
-
-  <property
-    name="service.core.dispatcher.obj.files"
-    value="Axis2Dispatcher${object.ext}
-           Axis2DispatcherModule${object.ext}"/>
-
-  <property
-    name="xsd.files"
-    value="sca-binding-webservice.xsd"/>
-
-  <!--
-    Public targets
-  -->
-  <target name="all" description="Compile, link, and install all TuscanyScaNative ws extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build" description="Compile and link all TuscanyScaNative ws extension source code">
-    <antcall target="compile"/>
-    <antcall target="link"/>
-  </target>
-
-  <target name="compile" description="Compile all TuscanyScaNative ws extension source code">
-    <antcall target="compile.ws.reference.core"/>
-    <antcall target="compile.ws.reference.model"/>
-    <antcall target="compile.ws.service.core"/>
-    <antcall target="compile.ws.service.model"/>
-  </target>
-
-  <target name="link" description="Link all TuscanyScaNative ws extension source code">
-    <antcall target="link.ws.reference"/>
-    <antcall target="link.ws.service"/>
-    <antcall target="link.ws.service.dispatcher"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative ws extension libraries and headers">
-    <antcall target="install.ws.reference"/>
-    <antcall target="install.ws.service"/>
-    <antcall target="install.ws.xsd"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative ws extension compiled source code">
-    <antcall target="clean.ws.reference"/>
-    <antcall target="clean.ws.service"/>
-    <antcall target="clean.ws.xsd"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- compile -->
-
-  <target name="compile.ws.reference.core" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${reference.core.dir}"
-        objdir="${reference.lib.dir}"
-        infiles="${reference.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${reference.dir}"/>
-        <includepath path="${axis2c.home.dir}/include"/>
-        <defineset if="windows" define="TUSCANY_SCA_WS_REFERENCE_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.ws.reference.model" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${reference.model.dir}"
-        objdir="${reference.lib.dir}"
-        infiles="${reference.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${reference.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_WS_REFERENCE_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.ws.service.core" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${service.core.dir}"
-        objdir="${service.lib.dir}"
-        infiles="${service.core.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${service.dir}"/>
-        <includepath path="${axis2c.home.dir}/include"/>
-        <defineset if="windows" define="TUSCANY_SCA_WS_SERVICE_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-  <target name="compile.ws.service.model" depends="check.ws" if="enable_ws">
-    <cpp-compile
-        srcdir="${service.model.dir}"
-        objdir="${service.lib.dir}"
-        infiles="${service.model.cpp.files}">
-      <custom-cc-elements>
-        <includepath path="${this.dir}/${service.dir}"/>
-        <defineset if="windows" define="TUSCANY_SCA_WS_SERVICE_EXPORTS"/>
-      </custom-cc-elements>
-    </cpp-compile>
-  </target>
-
-    <!-- link -->
-
-  <target name="link.ws.reference" depends="check.ws" if="enable_ws">
-    <cpp-link
-        outfile="${reference.extension.lib}"
-        outdir="${reference.lib.dir}"
-        indir="${reference.lib.dir}"
-        infiles="*${object.ext}">
-      <custom-ld-elements>
-        <libset dir="${sdo.lib.dir}" libs="tuscany_sdo_axiom"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_axiom"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_engine"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_minizip"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_parser"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_http_receiver"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_http_sender"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_util"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_wsdl"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="woden"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-  <target name="link.ws.service" depends="check.ws" if="enable_ws">
-    <cpp-link
-        outfile="${service.extension.lib}"
-        outdir="${service.lib.dir}"
-        indir="${service.lib.dir}"
-        infiles="${service.core.obj.files}">
-      <custom-ld-elements>
-        <libset dir="${sdo.lib.dir}" libs="tuscany_sdo_axiom"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_axiom"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_engine"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_minizip"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_parser"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_http_receiver"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_http_sender"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_util"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_wsdl"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="woden"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-  <target name="link.ws.service.dispatcher" depends="check.ws" if="enable_ws">
-    <cpp-link
-        outfile="${dispatcher.extension.lib}"
-        outdir="${service.lib.dir}"
-        indir="${service.lib.dir}"
-        infiles="${service.core.dispatcher.obj.files}">
-      <custom-ld-elements>
-        <libset dir="${sdo.lib.dir}" libs="tuscany_sdo_axiom"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_axiom"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_engine"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_minizip"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_parser"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_http_receiver"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_http_sender"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_util"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="axis2_wsdl"/>
-        <libset dir="${axis2c.home.dir}/lib" libs="woden"/>
-      </custom-ld-elements>
-    </cpp-link>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.ws.reference" depends="check.ws" if="enable_ws">
-    <cpp-install-lib
-        lib="${reference.extension.lib}"
-        srcdir="${reference.lib.dir}"
-        destrootdir="${ws.extension.install.dir}/reference"/>
-    <cpp-symlink
-        linkdir="${ws.extension.install.dir}/reference/lib"
-        link="${lib.prefix}${reference.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${reference.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${ws.extension.install.dir}/reference/module"
-        link="${lib.prefix}${reference.extension.lib}${lib.ext}"
-        resourcedir="${ws.extension.install.dir}/reference/lib"
-        resource="${lib.prefix}${reference.extension.lib}${lib.ext}"/>
-  </target>
-
-  <target name="install.ws.service" depends="check.ws" if="enable_ws">
-       <!-- install files in the root service extension directory -->
-    <cpp-install-file
-        srcfile="axis2.xml"
-        srcdir="${this.dir}/${service.dir}"
-        destdir="${ws.extension.install.dir}/service"
-        executable="false"/>
-    <cpp-install-file
-        srcfile="deploy${script.ext}"
-        srcdir="${this.dir}/${service.dir}"
-        destdir="${ws.extension.install.dir}/service"/>
-
-       <!-- install and link service extenstion lib -->
-    <cpp-install-lib
-        lib="${service.extension.lib}"
-        srcdir="${service.lib.dir}"
-        destrootdir="${ws.extension.install.dir}/service"/>
-    <cpp-symlink
-        linkdir="${ws.extension.install.dir}/service/lib"
-        link="${lib.prefix}${service.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${service.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-    <cpp-symlink
-        linkdir="${ws.extension.install.dir}/service/module"
-        link="${lib.prefix}${service.extension.lib}${lib.ext}"
-        resourcedir="${ws.extension.install.dir}/service/lib"
-        resource="${lib.prefix}${service.extension.lib}${lib.ext}"/>
-
-       <!-- install and link service dispatcher extenstion lib -->
-    <cpp-install-lib
-        lib="${dispatcher.extension.lib}"
-        srcdir="${service.lib.dir}"
-        destrootdir="${ws.extension.install.dir}/service"/>
-    <cpp-symlink
-        linkdir="${ws.extension.install.dir}/service/lib"
-        link="${lib.prefix}${dispatcher.extension.lib}${lib.ext}"
-        resource="${lib.prefix}${dispatcher.extension.lib}${lib.ext}${tuscanySCA.library.version}"/>
-
-       <!-- create and setup the service/modules/tuscany directory -->
-    <cpp-symlink
-        linkdir="${ws.extension.install.dir}/service/modules/tuscany"
-        link="${lib.prefix}${dispatcher.extension.lib}${lib.ext}"
-        resourcedir="${ws.extension.install.dir}/service/lib"
-        resource="${lib.prefix}${dispatcher.extension.lib}${lib.ext}"/>
-    <cpp-install-file
-        srcfile="module.xml"
-        srcdir="${this.dir}/${service.dir}"
-        destdir="${ws.extension.install.dir}/service/modules/tuscany"
-        executable="false"/>
-
-       <!-- create and setup the service/services/tuscany directory -->
-    <cpp-symlink
-        linkdir="${ws.extension.install.dir}/service/services/tuscany"
-        link="${lib.prefix}${service.extension.lib}${lib.ext}"
-        resourcedir="${ws.extension.install.dir}/service/lib"
-        resource="${lib.prefix}${service.extension.lib}${lib.ext}"/>
-    <cpp-install-file
-        srcfile="services.xml"
-        srcdir="${this.dir}/${service.dir}"
-        destdir="${ws.extension.install.dir}/service/services/tuscany"
-        executable="false"/>
-  </target>
-
-  <target name="install.ws.xsd" depends="check.ws" if="enable_ws">
-    <cpp-install-files
-        files="${xsd.files}"
-        srcdir="${xsd.dir}"
-        destdir="${ws.extension.install.dir}/xsd"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.ws.reference">
-    <cpp-clean-lib
-    	lib="${reference.extension.lib}"
-        librootdir="${ws.extension.install.dir}/reference"/>
-    <cpp-clean-files
-        dir="${ws.extension.install.dir}/reference/module"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${ws.extension.install.dir}/reference"
-        rmdir="true"/>
-    <delete dir="${reference.lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.ws.service">
-    <cpp-clean-lib
-    	lib="${service.extension.lib}"
-        librootdir="${ws.extension.install.dir}/service"/>
-  	<cpp-clean-lib
-        lib="${dispatcher.extension.lib}"
-        librootdir="${ws.extension.install.dir}/service"/>
-    <cpp-clean-files
-        dir="${ws.extension.install.dir}/service/module"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${ws.extension.install.dir}/service/modules/tuscany"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${ws.extension.install.dir}/service/services/tuscany"
-        rmdir="true"/>
-    <cpp-clean-files
-        dir="${ws.extension.install.dir}/service"
-        rmdir="true"/>
-    <delete dir="${service.lib.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean.ws.xsd">
-    <cpp-clean-files
-        dir="${ws.extension.install.dir}/xsd"
-        rmdir="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/AlertAggregator/build.xml b/cpp/sca/samples/AlertAggregator/build.xml
deleted file mode 100644
index c8d79f8fcf..0000000000
--- a/cpp/sca/samples/AlertAggregator/build.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_AlertAggregator" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir"                  location="${basedir}/samples/AlertAggregator"/>
-    <property name="sample.alerter.dir"        location="${this.dir}/sample.alerter"/>
-    <property name="sample.display.dir"        location="${this.dir}/sample.display"/>
-    <property name="sample.httpserver.dir"     location="${this.dir}/httpserver"/>
-    <property name="sample.httpserver.php.dir" location="${this.dir}/httpserver.php"/>
-
-    <property name="AlertAggregator.install.dir"
-              location="${tuscanySCA.install.dir}/samples/AlertAggregator"/>
-    <property name="sample.alerter.install.dir"
-              location="${AlertAggregator.install.dir}/sample.alerter"/>
-    <property name="sample.display.install.dir"
-              location="${AlertAggregator.install.dir}/sample.display"/>
-    <property name="sample.httpserver.install.dir"
-              location="${AlertAggregator.install.dir}/httpserver"/>
-    <property name="sample.httpserver.php.install.dir"
-              location="${AlertAggregator.install.dir}/httpserver.php"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative AlertAggregator sample">
-    <antcall target="install"/>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative AlertAggregator sample">
-
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${AlertAggregator.install.dir}"/>
-    <cpp-install-files
-        files="config.xml"
-        srcdir="${this.dir}"
-        destdir="${AlertAggregator.install.dir}"/>
-
-       <!-- install sample.alerter files -->
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.alerter.dir}"
-        destdir="${sample.alerter.install.dir}"/>
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.alerter.dir}"
-        destdir="${sample.alerter.install.dir}"/>
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${sample.alerter.dir}"
-        destdir="${sample.alerter.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${sample.alerter.dir}"
-        destdir="${sample.alerter.install.dir}"/>
-
-       <!-- install sample.display files -->
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.display.dir}"
-        destdir="${sample.display.install.dir}"/>
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.display.dir}"
-        destdir="${sample.display.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${sample.display.dir}"
-        destdir="${sample.display.install.dir}"/>
-
-       <!-- install httpserver files -->
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${sample.httpserver.dir}"
-        destdir="${sample.httpserver.install.dir}"
-        executable="true"/>
-    <cpp-install-files
-        files="*.types"
-        srcdir="${sample.httpserver.dir}/conf"
-        destdir="${sample.httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.conf"
-        srcdir="${sample.httpserver.dir}/conf"
-        destdir="${sample.httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.html"
-        srcdir="${sample.httpserver.dir}/htdocs"
-        destdir="${sample.httpserver.install.dir}/htdocs"/>
-    <cpp-install-files
-        files="*.css"
-        srcdir="${sample.httpserver.dir}/htdocs"
-        destdir="${sample.httpserver.install.dir}/htdocs"/>
-    <cpp-install-files
-        files="*.png"
-        srcdir="${sample.httpserver.dir}/htdocs"
-        destdir="${sample.httpserver.install.dir}/htdocs"/>
-
-       <!-- install httpserver.php files -->
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${sample.httpserver.php.dir}"
-        destdir="${sample.httpserver.php.install.dir}"
-        executable="true"/>
-    <cpp-install-files
-        files="*.types"
-        srcdir="${sample.httpserver.php.dir}/conf"
-        destdir="${sample.httpserver.php.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.conf"
-        srcdir="${sample.httpserver.php.dir}/conf"
-        destdir="${sample.httpserver.php.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.html"
-        srcdir="${sample.httpserver.php.dir}/htdocs"
-        destdir="${sample.httpserver.php.install.dir}/htdocs"/>
-    <cpp-install-files
-        files="*.css"
-        srcdir="${sample.httpserver.php.dir}/htdocs"
-        destdir="${sample.httpserver.php.install.dir}/htdocs"/>
-    <cpp-install-files
-        files="*.png"
-        srcdir="${sample.httpserver.php.dir}/htdocs"
-        destdir="${sample.httpserver.php.install.dir}/htdocs"/>
-    <cpp-install-files
-        files="*.php"
-        srcdir="${sample.httpserver.php.dir}/htdocs"
-        destdir="${sample.httpserver.php.install.dir}/htdocs"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${sample.httpserver.php.dir}/htdocs"
-        destdir="${sample.httpserver.php.install.dir}/htdocs"/>
-    <cpp-install-files
-        files="*.xml"
-        srcdir="${sample.httpserver.php.dir}/htdocs"
-        destdir="${sample.httpserver.php.install.dir}/htdocs"/>
-
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative AlertAggregator sample">
-    <delete dir="${AlertAggregator.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/CppBigBank/VSExpress/Build/Build.vcproj b/cpp/sca/samples/CppBigBank/VSExpress/Build/Build.vcproj
deleted file mode 100644
index 78527d02b5..0000000000
--- a/cpp/sca/samples/CppBigBank/VSExpress/Build/Build.vcproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="Build"

-	ProjectGUID="{ECD99F95-6AE5-42B8-8285-6341AD1B4D22}"

-	Keyword="MakeFileProj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/Build.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/Build.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/CppBigBank/VSExpress/Build/Build.vcproj.user b/cpp/sca/samples/CppBigBank/VSExpress/Build/Build.vcproj.user
deleted file mode 100644
index 4eae0888d7..0000000000
--- a/cpp/sca/samples/CppBigBank/VSExpress/Build/Build.vcproj.user
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioUserFile

-	ProjectType="Visual C++"

-	Version="8.00"

-	ShowAllFiles="false"

-	>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			>

-			<DebugSettings

-				Command="$(TUSCANY_SCACPP)\samples\CppBigBank\deploy\bigbank.client\AccountClient.exe"

-				WorkingDirectory="$(TUSCANY_SCACPP)\samples\CppBigBank\deploy"

-				CommandArguments="1234"

-				Attach="false"

-				DebuggerType="3"

-				Remote="1"

-				RemoteMachine=""

-				RemoteCommand=""

-				HttpUrl=""

-				PDBPath=""

-				SQLDebugging=""

-				Environment="PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%&#x0A;TUSCANY_SCACPP_ROOT=%TUSCANY_SCACPP%\samples\CppBigBank\deploy&#x0A;TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent"

-				EnvironmentMerge="true"

-				DebuggerFlavor="0"

-				MPIRunCommand=""

-				MPIRunArguments=""

-				MPIRunWorkingDirectory=""

-				ApplicationCommand=""

-				ApplicationArguments=""

-				ShimCommand=""

-				MPIAcceptMode=""

-				MPIAcceptFilter=""

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			>

-			<DebugSettings

-				Command="$(TUSCANY_SCACPP)\samples\CppBigBank\deploy\bigbank.client\AccountClient.exe"

-				WorkingDirectory="$(TUSCANY_SCACPP)\samples\CppBigBank\deploy"

-				CommandArguments="1234"

-				Attach="false"

-				DebuggerType="3"

-				Remote="1"

-				RemoteMachine=""

-				RemoteCommand=""

-				HttpUrl=""

-				PDBPath=""

-				SQLDebugging=""

-				Environment="PATH=$TUSCANY_SDOCPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%&#x0A;TUSCANY_SCACPP_ROOT=%TUSCANY_SCACPP%\samples\CppBigBank\deploy&#x0A;TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent"

-				EnvironmentMerge="true"

-				DebuggerFlavor="0"

-				MPIRunCommand=""

-				MPIRunArguments=""

-				MPIRunWorkingDirectory=""

-				ApplicationCommand=""

-				ApplicationArguments=""

-				ShimCommand=""

-				MPIAcceptMode=""

-				MPIAcceptFilter=""

-			/>

-		</Configuration>

-	</Configurations>

-</VisualStudioUserFile>

diff --git a/cpp/sca/samples/CppBigBank/VSExpress/CppBigBank.sln b/cpp/sca/samples/CppBigBank/VSExpress/CppBigBank.sln
deleted file mode 100644
index 068eaed614..0000000000
--- a/cpp/sca/samples/CppBigBank/VSExpress/CppBigBank.sln
+++ /dev/null
@@ -1,39 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C++ Express 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigbank.client", "bigbank.client\bigbank.client.vcproj", "{992AACB6-A3BD-489B-9C5B-5363E5A01CBE}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bigbank.account", "bigbank.account\bigbank.account.vcproj", "{808B20C7-F853-4F92-89A6-ADA10C52C28C}"

-	ProjectSection(ProjectDependencies) = postProject

-		{992AACB6-A3BD-489B-9C5B-5363E5A01CBE} = {992AACB6-A3BD-489B-9C5B-5363E5A01CBE}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build\Build.vcproj", "{ECD99F95-6AE5-42B8-8285-6341AD1B4D22}"

-	ProjectSection(ProjectDependencies) = postProject

-		{992AACB6-A3BD-489B-9C5B-5363E5A01CBE} = {992AACB6-A3BD-489B-9C5B-5363E5A01CBE}

-		{808B20C7-F853-4F92-89A6-ADA10C52C28C} = {808B20C7-F853-4F92-89A6-ADA10C52C28C}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{992AACB6-A3BD-489B-9C5B-5363E5A01CBE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{992AACB6-A3BD-489B-9C5B-5363E5A01CBE}.Debug|Win32.Build.0 = Debug|Win32

-		{992AACB6-A3BD-489B-9C5B-5363E5A01CBE}.Release|Win32.ActiveCfg = Release|Win32

-		{992AACB6-A3BD-489B-9C5B-5363E5A01CBE}.Release|Win32.Build.0 = Release|Win32

-		{808B20C7-F853-4F92-89A6-ADA10C52C28C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{808B20C7-F853-4F92-89A6-ADA10C52C28C}.Debug|Win32.Build.0 = Debug|Win32

-		{808B20C7-F853-4F92-89A6-ADA10C52C28C}.Release|Win32.ActiveCfg = Release|Win32

-		{808B20C7-F853-4F92-89A6-ADA10C52C28C}.Release|Win32.Build.0 = Release|Win32

-		{ECD99F95-6AE5-42B8-8285-6341AD1B4D22}.Debug|Win32.ActiveCfg = Debug|Win32

-		{ECD99F95-6AE5-42B8-8285-6341AD1B4D22}.Debug|Win32.Build.0 = Debug|Win32

-		{ECD99F95-6AE5-42B8-8285-6341AD1B4D22}.Release|Win32.ActiveCfg = Release|Win32

-		{ECD99F95-6AE5-42B8-8285-6341AD1B4D22}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/cpp/sca/samples/CppBigBank/VSExpress/bigbank.account/bigbank.account.vcproj b/cpp/sca/samples/CppBigBank/VSExpress/bigbank.account/bigbank.account.vcproj
deleted file mode 100644
index fce5d7091b..0000000000
--- a/cpp/sca/samples/CppBigBank/VSExpress/bigbank.account/bigbank.account.vcproj
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="bigbank.account"

-	ProjectGUID="{808B20C7-F853-4F92-89A6-ADA10C52C28C}"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="call ..\..\..\scagen.bat ..\..\bigbank.account"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/Accounts.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(TUSCANY_SCACPP)\include,$(TUSCANY_SCACPP)\extensions\cpp\include,$(TUSCANY_SDOCPP)\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ACCOUNTS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				PrecompiledHeaderFile=".\Debug/Accounts.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile="Debug/Account.dll"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/extensions/cpp/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SDOCPP)/lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/Account.pdb"

-				ImportLibrary=".\Debug/Account.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug/Accounts.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deploy.bat ..\..\ Debug"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="call ..\..\..\scagen.bat ..\..\bigbank.account"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/Accounts.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="$(TUSCANY_SCACPP)\include,$(TUSCANY_SCACPP)\extensions\cpp\include,$(TUSCANY_SDOCPP)\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ACCOUNTS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/Accounts.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile="Release/Account.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/extensions/cpp/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SDOCPP)/lib"

-				ProgramDatabaseFile=".\Release/Account.pdb"

-				ImportLibrary=".\Release/Account.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release/Accounts.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deploy.bat ..\..\ Release"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\bigbank.account\AccountDataServiceImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountDataServiceImpl_AccountDataService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountDataServiceImpl_AccountDataService_Wrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_accountDataService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_AccountService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_AccountService_Wrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_stockQuoteService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl_StockQuoteService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl_StockQuoteService_Wrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl_webService_Proxy.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\..\bigbank.account\AccountDataService.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountDataServiceImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountDataServiceImpl_AccountDataService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountDataServiceImpl_AccountDataService_Wrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountService.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_accountDataService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_AccountService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_AccountService_Wrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\AccountServiceImpl_stockQuoteService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteService.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl_StockQuoteService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl_StockQuoteService_Wrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteServiceImpl_webService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\bigbank.account\StockQuoteWebService.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/CppBigBank/VSExpress/bigbank.client/bigbank.client.vcproj b/cpp/sca/samples/CppBigBank/VSExpress/bigbank.client/bigbank.client.vcproj
deleted file mode 100644
index 0460446ba2..0000000000
--- a/cpp/sca/samples/CppBigBank/VSExpress/bigbank.client/bigbank.client.vcproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="bigbank.client"

-	ProjectGUID="{992AACB6-A3BD-489B-9C5B-5363E5A01CBE}"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/AccountClient.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\bigbank.account;&quot;$(TUSCANY_SCACPP)\include&quot;;&quot;$(TUSCANY_SCACPP)\extensions\cpp\include&quot;;&quot;$(TUSCANY_SDOCPP)\include&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/AccountClient.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile=".\Release/AccountClient.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/extensions/cpp/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SDOCPP)/lib"

-				ProgramDatabaseFile=".\Release/AccountClient.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release/AccountClient.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deployclient.bat ..\..\ Release"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/AccountClient.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\bigbank.account;&quot;$(TUSCANY_SCACPP)\include&quot;;&quot;$(TUSCANY_SCACPP)\extensions\cpp\include&quot;;&quot;$(TUSCANY_SDOCPP)\include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				PrecompiledHeaderFile=".\Debug/AccountClient.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile=".\Debug/AccountClient.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/extensions/cpp/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SDOCPP)/lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/AccountClient.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug/AccountClient.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deployclient.bat ..\..\ Debug"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\bigbank.client\AccountClient.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/CppBigBank/build.xml b/cpp/sca/samples/CppBigBank/build.xml
deleted file mode 100644
index a97fa1043b..0000000000
--- a/cpp/sca/samples/CppBigBank/build.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_CppBigBank" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir"                   location="${basedir}/samples/CppBigBank"/>
-    <property name="bigbank.account.dir"        location="${this.dir}/bigbank.account"/>
-    <property name="bigbank.account.build.dir"  location="${bigbank.account.dir}/build"/>
-    <property name="bigbank.client.dir"         location="${this.dir}/bigbank.client"/>
-    <property name="bigbank.client.build.dir"   location="${bigbank.client.dir}/build"/>
-    <property name="bigbank.phpwsclient.dir"    location="${this.dir}/bigbank.phpwsclient"/>
-    <property name="scagen.jar"                 value="${tuscanySCA.install.dir}/extensions/cpp/bin/scagen.jar"/>
-    <property name="CppBigBank.install.dir"
-              location="${tuscanySCA.install.dir}/samples/CppBigBank"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="build and install the TuscanyScaNative CppBigBank sample">
-    <antcall target="build"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build"
-          depends="init"
-          description="build the TuscanyScaNative CppBigBank sample">
-    <antcall target="build.bigbank.account"/>
-    <antcall target="build.bigbank.client"/>
-    <antcall target="build.bigbank.phpwsclient"/>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative CppBigBank sample">
-    <antcall target="install.bigbank.account"/>
-    <antcall target="install.bigbank.client"/>
-    <antcall target="install.bigbank.phpwsclient"/>
-    <cpp-install-file
-        srcfile="bigbank.app.composite"
-        srcdir="${this.dir}"
-        destdir="${CppBigBank.install.dir}"
-        executable="false"/>
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative CppBigBank sample">
-    <antcall target="clean.bigbank.account"/>
-    <antcall target="clean.bigbank.client"/>
-    <antcall target="clean.bigbank.phpwsclient"/>
-    <delete dir="${CppBigBank.install.dir}" quiet="true"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- build -->
-
-  <target name="build.bigbank.account" depends="init">
-       <!-- scagen -->
-    <mkdir dir="${bigbank.account.build.dir}"/>
-    <java jar="${scagen.jar}" fork="true">
-      <arg line="-dir ${bigbank.account.dir} -output ${bigbank.account.build.dir}"/>
-    </java>
-
-      <!-- put all the cpp/h files together with the scagen'd files to make the library -->
-    <copy todir="${bigbank.account.build.dir}">
-      <fileset dir="${bigbank.account.dir}" includes="*.h"/>
-      <fileset dir="${bigbank.account.dir}" includes="*.cpp"/>
-    </copy>
-
-      <!-- build the library -->
-    <cpp-build
-        srcdir="${bigbank.account.build.dir}"
-        infiles="*.cpp"
-        outdir="${bigbank.account.build.dir}/.libs"
-        outfile="Account">
-      <custom-build-elements>
-        <includepath path="${tuscanySCA.install.dir}/include"/>
-        <includepath path="${tuscanySCA.install.dir}/extensions/cpp/include"/>
-        <libset dir="${tuscanySCA.install.dir}/extensions/cpp/lib" libs="tuscany_sca_cpp"/>
-        <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
-      </custom-build-elements>
-    </cpp-build>
-  </target>
-
-  <target name="build.bigbank.client" depends="init">
-    <cpp-build
-        srcdir="${bigbank.client.dir}"
-        infiles="AccountClient.cpp"
-        outdir="${bigbank.client.build.dir}"
-        outfile="AccountClient"
-        outtype="executable">
-      <custom-build-elements>
-        <includepath path="${tuscanySCA.install.dir}/include"/>
-        <includepath path="${tuscanySCA.install.dir}/extensions/cpp/include"/>
-        <includepath path="${bigbank.account.dir}"/>
-        <libset dir="${tuscanySCA.install.dir}/extensions/cpp/lib" libs="tuscany_sca_cpp"/>
-        <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
-        <syslibset unless="windows" libs="dl"/>
-      </custom-build-elements>
-    </cpp-build>
-  </target>
-
-  <target name="build.bigbank.phpwsclient" depends="init">
-  </target>
-
-    <!-- install -->
-
-  <target name="install.bigbank.account" depends="init">
-
-      <!-- Install all the componentType files -->
-    <cpp-install-files
-        files="*.componentType"
-        srcdir="${bigbank.account.dir}"
-        destdir="${CppBigBank.install.dir}/bigbank.account"/>
-
-      <!-- Install the composite, the wsdls, and the xsds -->
-    <cpp-install-files
-        files="AccountService.wsdl StockQuoteWebService.wsdl StockQuoteTypes.xsd bigbank.account.composite"
-        srcdir="${bigbank.account.dir}"
-        destdir="${CppBigBank.install.dir}/bigbank.account"/>
-
-      <!-- Install the runwsserver script -->
-    <cpp-install-file
-        srcfile="runwsserver${script.ext}"
-        srcdir="${bigbank.account.dir}"
-        destdir="${CppBigBank.install.dir}/bigbank.account"/>
-
-      <!-- Install the library -->
-    <condition property="bigbank.lib.ext" value="${dll.ext}">
-      <os family="windows"/>
-    </condition>
-    <property name="bigbank.lib.ext" value="${lib.ext}"/>
-    <cpp-install-file
-        srcfile="${lib.prefix}Account${bigbank.lib.ext}"
-        destfile="${lib.prefix}Account${bigbank.lib.ext}${tuscanySCA.library.version}"
-        srcdir="${bigbank.account.dir}/build/.libs"
-        destdir="${CppBigBank.install.dir}/bigbank.account"/>
-    <cpp-symlink
-        linkdir="${CppBigBank.install.dir}/bigbank.account"
-        link="${lib.prefix}Account${bigbank.lib.ext}"
-        resource="${lib.prefix}Account${bigbank.lib.ext}${tuscanySCA.library.version}"/>
-  </target>
-
-  <target name="install.bigbank.client" depends="init">
-    <cpp-install-file
-        srcfile="runclient${script.ext}"
-        srcdir="${bigbank.client.dir}"
-        destdir="${CppBigBank.install.dir}/bigbank.client"/>
-    <cpp-install-file
-        srcfile="AccountClient${exe.ext}"
-        srcdir="${bigbank.client.build.dir}"
-        destdir="${CppBigBank.install.dir}/bigbank.client"/>
-  </target>
-
-  <target name="install.bigbank.phpwsclient" depends="init">
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.bigbank.account" depends="init">
-    <delete dir="${bigbank.account.build.dir}" quiet="true"/>
-    <delete dir="${CppBigBank.install.dir}/bigbank.account" quiet="true"/>
-  </target>
-
-  <target name="clean.bigbank.client" depends="init">
-    <delete dir="${bigbank.client.build.dir}" quiet="true"/>
-    <delete dir="${CppBigBank.install.dir}/bigbank.client" quiet="true"/>
-  </target>
-
-  <target name="clean.bigbank.phpwsclient" depends="init">
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/CppCalculator/VSExpress/Build/Build.vcproj b/cpp/sca/samples/CppCalculator/VSExpress/Build/Build.vcproj
deleted file mode 100644
index c33437a8cd..0000000000
--- a/cpp/sca/samples/CppCalculator/VSExpress/Build/Build.vcproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="Build"

-	ProjectGUID="{4D8888D4-CC80-4008-B3B4-6772A0CA9010}"

-	Keyword="MakeFileProj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/Build.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/Build.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/CppCalculator/VSExpress/Build/Build.vcproj.user b/cpp/sca/samples/CppCalculator/VSExpress/Build/Build.vcproj.user
deleted file mode 100644
index 8b18d57ac5..0000000000
--- a/cpp/sca/samples/CppCalculator/VSExpress/Build/Build.vcproj.user
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioUserFile

-	ProjectType="Visual C++"

-	Version="8.00"

-	ShowAllFiles="false"

-	>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			>

-			<DebugSettings

-				Command="$(TUSCANY_SCACPP)\samples\CppCalculator\deploy\sample.calculator.client\calculator_client.exe"

-				WorkingDirectory="$(TUSCANY_SCACPP)\samples\CppCalculator\deploy\sample.calculator.client"

-				CommandArguments="mul 7 6"

-				Attach="false"

-				DebuggerType="3"

-				Remote="1"

-				RemoteMachine=""

-				RemoteCommand=""

-				HttpUrl=""

-				PDBPath=""

-				SQLDebugging=""

-				Environment="PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%&#x0A;TUSCANY_SCACPP_ROOT=%TUSCANY_SCACPP%\samples\CppCalculator\deploy&#x0A;TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent"

-				EnvironmentMerge="true"

-				DebuggerFlavor="0"

-				MPIRunCommand=""

-				MPIRunArguments=""

-				MPIRunWorkingDirectory=""

-				ApplicationCommand=""

-				ApplicationArguments=""

-				ShimCommand=""

-				MPIAcceptMode=""

-				MPIAcceptFilter=""

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			>

-			<DebugSettings

-				Command="$(TUSCANY_SCACPP)\samples\CppCalculator\deploy\sample.calculator.client\calculator_client.exe"

-				WorkingDirectory="$(TUSCANY_SCACPP)\samples\CppCalculator\deploy\sample.calculator.client"

-				CommandArguments="mul 7 6"

-				Attach="false"

-				DebuggerType="3"

-				Remote="1"

-				RemoteMachine=""

-				RemoteCommand=""

-				HttpUrl=""

-				PDBPath=""

-				SQLDebugging=""

-				Environment="PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%&#x0A;TUSCANY_SCACPP_ROOT=%TUSCANY_SCACPP%\samples\CppCalculator\deploy&#x0A;TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent"

-				EnvironmentMerge="true"

-				DebuggerFlavor="0"

-				MPIRunCommand=""

-				MPIRunArguments=""

-				MPIRunWorkingDirectory=""

-				ApplicationCommand=""

-				ApplicationArguments=""

-				ShimCommand=""

-				MPIAcceptMode=""

-				MPIAcceptFilter=""

-			/>

-		</Configuration>

-	</Configurations>

-</VisualStudioUserFile>

diff --git a/cpp/sca/samples/CppCalculator/VSExpress/CppCalculator.sln b/cpp/sca/samples/CppCalculator/VSExpress/CppCalculator.sln
deleted file mode 100644
index 941a48a3f7..0000000000
--- a/cpp/sca/samples/CppCalculator/VSExpress/CppCalculator.sln
+++ /dev/null
@@ -1,39 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C++ Express 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build\Build.vcproj", "{4D8888D4-CC80-4008-B3B4-6772A0CA9010}"

-	ProjectSection(ProjectDependencies) = postProject

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E} = {799C40A9-9DDB-4DCD-806D-50205508AE0E}

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3} = {8DD6E7A7-912D-49DD-9517-A91E8FB040D3}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample.calculator", "sample.calculator\sample.calculator.vcproj", "{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}"

-	ProjectSection(ProjectDependencies) = postProject

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E} = {799C40A9-9DDB-4DCD-806D-50205508AE0E}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample.calculator.client", "sample.calculator.client\sample.calculator.client.vcproj", "{799C40A9-9DDB-4DCD-806D-50205508AE0E}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Debug|Win32.Build.0 = Debug|Win32

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Release|Win32.ActiveCfg = Release|Win32

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Release|Win32.Build.0 = Release|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Debug|Win32.Build.0 = Debug|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Release|Win32.ActiveCfg = Release|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Release|Win32.Build.0 = Release|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Debug|Win32.Build.0 = Debug|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Release|Win32.ActiveCfg = Release|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/cpp/sca/samples/CppCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj b/cpp/sca/samples/CppCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
deleted file mode 100644
index 66e62def41..0000000000
--- a/cpp/sca/samples/CppCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="sample.calculator.client"

-	ProjectGUID="{799C40A9-9DDB-4DCD-806D-50205508AE0E}"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/Client.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\sample.calculator;&quot;$(TUSCANY_SDOCPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/extensions/cpp/include&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				PrecompiledHeaderFile=".\Debug/Client.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile="Debug/calculator_client.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/calculator_client.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug/Client.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deployclient.bat ..\..\ Debug&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/Client.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\sample.calculator;&quot;$(TUSCANY_SDOCPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/extensions/cpp/include&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/Client.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile="Release/calculator_client.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				ProgramDatabaseFile=".\Release/calculator_client.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release/Client.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deployclient.bat ..\..\ Release&#x0D;&#x0A;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\sample.calculator.client\CalculatorClient.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/CppCalculator/VSExpress/sample.calculator/sample.calculator.vcproj b/cpp/sca/samples/CppCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
deleted file mode 100644
index 81493af9aa..0000000000
--- a/cpp/sca/samples/CppCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="sample.calculator"

-	ProjectGUID="{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="..\..\..\scagen.bat ..\..\sample.calculator"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/Calculator.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(TUSCANY_SDOCPP)/include,$(TUSCANY_SCACPP)/include,$(TUSCANY_SCACPP)/extensions/cpp/include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CALCULATOR_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				PrecompiledHeaderFile=".\Debug/Calculator.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sca_cpp.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"

-				OutputFile=".\Debug/Calculator.dll"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/Calculator.pdb"

-				ImportLibrary=".\Debug/Calculator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug/Calculator.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deploy.bat ..\..\ Debug"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="..\..\..\scagen.bat ..\..\sample.calculator"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/Calculator.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="$(TUSCANY_SDOCPP)/include,$(TUSCANY_SCACPP)/include,$(TUSCANY_SCACPP)/extensions/cpp/include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CALCULATOR_EXPORTS"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/Calculator.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sca_cpp.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"

-				OutputFile=".\Release/Calculator.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				ProgramDatabaseFile=".\Release/Calculator.pdb"

-				ImportLibrary=".\Release/Calculator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release/Calculator.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deploy.bat ..\..\ Release"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_divideService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Wrapper.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\..\sample.calculator\Calculator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_divideService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\Divide.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Wrapper.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/CppCalculator/build.xml b/cpp/sca/samples/CppCalculator/build.xml
deleted file mode 100644
index 6b4a719b20..0000000000
--- a/cpp/sca/samples/CppCalculator/build.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_CppCalculator" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir" location="${basedir}/samples/CppCalculator"/>
-    <property name="sample.calculator.dir"            location="${this.dir}/sample.calculator"/>
-    <property name="sample.calculator.build.dir"      location="${sample.calculator.dir}/build"/>
-    <property name="sample.calculator.client.dir"     location="${this.dir}/sample.calculator.client"/>
-    <property name="sample.calculator.client.build.dir"
-              location="${sample.calculator.client.dir}/build"/>
-    <property name="CppCalculator.install.dir"
-              location="${tuscanySCA.install.dir}/samples/CppCalculator"/>
-    <property name="scagen.jar"
-              value="${tuscanySCA.install.dir}/extensions/cpp/bin/scagen.jar"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          description="build and install the TuscanyScaNative CppCalculator sample">
-    <antcall target="build"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build"
-          description="build the TuscanyScaNative CppCalculator sample">
-    <antcall target="build.sample.calculator"/>
-    <antcall target="build.sample.calculator.client"/>
-  </target>
-
-  <target name="install"
-          description="Install the TuscanyScaNative CppCalculator sample">
-    <antcall target="install.sample.calculator"/>
-    <antcall target="install.sample.calculator.client"/>
-  </target>
-
-  <target name="clean"
-          description="Clean the TuscanyScaNative CppCalculator sample">
-    <antcall target="clean.sample.calculator"/>
-    <antcall target="clean.sample.calculator.client"/>
-    <delete dir="${CppCalculator.install.dir}" quiet="true"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-    <!-- build -->
-
-  <target name="build.sample.calculator" depends="init">
-       <!-- scagen -->
-    <mkdir dir="${sample.calculator.build.dir}"/>
-    <java jar="${scagen.jar}" fork="true">
-      <arg line="-dir ${sample.calculator.dir} -output ${sample.calculator.build.dir}"/>
-    </java>
-
-    <!-- put all the cpp/h files together with the scagen'd files to make the library -->
-    <copy todir="${sample.calculator.build.dir}">
-      <fileset dir="${sample.calculator.dir}" includes="*.h"/>
-      <fileset dir="${sample.calculator.dir}" includes="*.cpp"/>
-    </copy>
-
-    <!-- build the library -->
-    <cpp-build
-        srcdir="${sample.calculator.build.dir}"
-        infiles="*.cpp"
-        outdir="${sample.calculator.build.dir}/.libs"
-        outfile="Calculator">
-      <custom-build-elements>
-        <includepath path="${tuscanySCA.install.dir}/include"/>
-        <includepath path="${tuscanySCA.install.dir}/extensions/cpp/include"/>
-        <libset dir="${tuscanySCA.install.dir}/extensions/cpp/lib" libs="tuscany_sca_cpp"/>
-        <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
-      </custom-build-elements>
-    </cpp-build>
-  </target>
-
-  <target name="build.sample.calculator.client" depends="init">
-    <cpp-build
-        srcdir="${sample.calculator.client.dir}"
-        infiles="CalculatorClient.cpp"
-        outdir="${sample.calculator.client.build.dir}"
-        outfile="calculator_client"
-        outtype="executable">
-      <custom-build-elements>
-        <includepath path="${tuscanySCA.install.dir}/include"/>
-        <includepath path="${tuscanySCA.install.dir}/extensions/cpp/include"/>
-        <includepath path="${sample.calculator.dir}"/>
-        <libset dir="${tuscanySCA.install.dir}/extensions/cpp/lib" libs="tuscany_sca_cpp"/>
-        <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
-        <syslibset unless="windows" libs="dl"/>
-      </custom-build-elements>
-    </cpp-build>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.sample.calculator" depends="init">
-      <!-- Install all the componentType files -->
-    <cpp-install-files
-        files="*.componentType"
-        srcdir="${sample.calculator.dir}"
-        destdir="${CppCalculator.install.dir}/sample.calculator"/>
-
-      <!-- Install the composites -->
-    <cpp-install-files
-        files="sample.calculator.app.composite"
-        srcdir="${this.dir}"
-        destdir="${CppCalculator.install.dir}"/>
-
-    <cpp-install-files
-        files="sample.calculator.composite"
-        srcdir="${sample.calculator.dir}"
-        destdir="${CppCalculator.install.dir}/sample.calculator"/>
-
-      <!-- Install the library -->
-    <condition property="calculator.lib.ext" value="${dll.ext}">
-      <os family="windows"/>
-    </condition>
-    <property name="calculator.lib.ext" value="${lib.ext}"/>
-    <cpp-install-file
-        srcfile="${lib.prefix}Calculator${calculator.lib.ext}"
-        destfile="${lib.prefix}Calculator${calculator.lib.ext}${tuscanySCA.library.version}"
-        srcdir="${sample.calculator.build.dir}/.libs"
-        destdir="${CppCalculator.install.dir}/sample.calculator"/>
-    <cpp-symlink
-        linkdir="${CppCalculator.install.dir}/sample.calculator"
-        link="${lib.prefix}Calculator${calculator.lib.ext}"
-        resource="${lib.prefix}Calculator${calculator.lib.ext}${tuscanySCA.library.version}"/>
-  </target>
-
-  <target name="install.sample.calculator.client" depends="init">
-    <cpp-install-file
-        srcfile="runclient${script.ext}"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${CppCalculator.install.dir}/sample.calculator.client"/>
-    <cpp-install-file
-        srcfile="calculator_client${exe.ext}"
-        srcdir="${sample.calculator.client.build.dir}"
-        destdir="${CppCalculator.install.dir}/sample.calculator.client"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.sample.calculator" depends="init">
-    <delete dir="${sample.calculator.build.dir}" quiet="true"/>
-    <delete dir="${CppCalculator.install.dir}/sample.calculator" quiet="true"/>
-    <delete file="${CppCalculator.install.dir}/sample.calculator.app.composite" quiet="true"/>
-  </target>
-
-  <target name="clean.sample.calculator.client" depends="init">
-    <delete dir="${sample.calculator.client.build.dir}" quiet="true"/>
-    <delete dir="${CppCalculator.install.dir}/sample.calculator.client" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/HttpdBigBank/build.xml b/cpp/sca/samples/HttpdBigBank/build.xml
deleted file mode 100644
index 78bae4493c..0000000000
--- a/cpp/sca/samples/HttpdBigBank/build.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_HttpdBigBank" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir"                 location="${basedir}/samples/HttpdBigBank"/>
-    <property name="bigbank.account.dir"      location="${this.dir}/bigbank.account"/>
-    <property name="bigbank.accountdata.dir"  location="${this.dir}/bigbank.accountdata"/>
-    <property name="bigbank.wsclient.dir"     location="${this.dir}/bigbank.wsclient"/>
-    <property name="httpserver.dir"           location="${this.dir}/httpserver"/>
-
-    <property name="HttpdBigBank.install.dir"
-              location="${tuscanySCA.install.dir}/samples/HttpdBigBank"/>
-    <property name="bigbank.account.install.dir"
-              location="${HttpdBigBank.install.dir}/bigbank.account"/>
-    <property name="bigbank.accountdata.install.dir"
-              location="${HttpdBigBank.install.dir}/bigbank.accountdata"/>
-    <property name="bigbank.wsclient.install.dir"
-              location="${HttpdBigBank.install.dir}/bigbank.wsclient"/>
-    <property name="httpserver.install.dir"
-              location="${HttpdBigBank.install.dir}/httpserver"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative HttpdBigBank sample">
-    <antcall target="install"/>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative HttpdBigBank sample">
-
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${HttpdBigBank.install.dir}"/>
-
-       <!-- install bigbank.account.files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-    <cpp-install-files
-        files="*.wsdl"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-
-       <!-- install bigbank.accountdata.files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${bigbank.accountdata.dir}"
-        destdir="${bigbank.accountdata.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${bigbank.accountdata.dir}"
-        destdir="${bigbank.accountdata.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${bigbank.accountdata.dir}"
-        destdir="${bigbank.accountdata.install.dir}"/>
-
-       <!-- install bigbank.wsclient files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${bigbank.wsclient.dir}"
-        destdir="${bigbank.wsclient.install.dir}"/>
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${bigbank.wsclient.dir}"
-        destdir="${bigbank.wsclient.install.dir}"
-        executable="true"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${bigbank.wsclient.dir}"
-        destdir="${bigbank.wsclient.install.dir}"/>
-    <cpp-install-files
-        files="*.wsdl"
-        srcdir="${bigbank.wsclient.dir}"
-        destdir="${bigbank.wsclient.install.dir}"/>
-
-       <!-- install httpserver files -->
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${httpserver.dir}"
-        destdir="${httpserver.install.dir}"
-        executable="true"/>
-    <cpp-install-files
-        files="*.types"
-        srcdir="${httpserver.dir}/conf"
-        destdir="${httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.conf"
-        srcdir="${httpserver.dir}/conf"
-        destdir="${httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.html"
-        srcdir="${httpserver.dir}/htdocs"
-        destdir="${httpserver.install.dir}/htdocs"/>
-
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative HttpdBigBank sample">
-    <delete dir="${HttpdBigBank.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/PHPCalculator/VSExpress/Build/Build.vcproj b/cpp/sca/samples/PHPCalculator/VSExpress/Build/Build.vcproj
deleted file mode 100644
index c33437a8cd..0000000000
--- a/cpp/sca/samples/PHPCalculator/VSExpress/Build/Build.vcproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="Build"

-	ProjectGUID="{4D8888D4-CC80-4008-B3B4-6772A0CA9010}"

-	Keyword="MakeFileProj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/Build.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="10"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/Build.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/PHPCalculator/VSExpress/PHPCalculator.sln b/cpp/sca/samples/PHPCalculator/VSExpress/PHPCalculator.sln
deleted file mode 100644
index 899bb2c713..0000000000
--- a/cpp/sca/samples/PHPCalculator/VSExpress/PHPCalculator.sln
+++ /dev/null
@@ -1,36 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual C++ Express 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build\Build.vcproj", "{4D8888D4-CC80-4008-B3B4-6772A0CA9010}"

-	ProjectSection(ProjectDependencies) = postProject

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3} = {8DD6E7A7-912D-49DD-9517-A91E8FB040D3}

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E} = {799C40A9-9DDB-4DCD-806D-50205508AE0E}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample.calculator", "sample.calculator\sample.calculator.vcproj", "{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample.calculator.client", "sample.calculator.client\sample.calculator.client.vcproj", "{799C40A9-9DDB-4DCD-806D-50205508AE0E}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Debug|Win32.Build.0 = Debug|Win32

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Release|Win32.ActiveCfg = Release|Win32

-		{4D8888D4-CC80-4008-B3B4-6772A0CA9010}.Release|Win32.Build.0 = Release|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Debug|Win32.Build.0 = Debug|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Release|Win32.ActiveCfg = Release|Win32

-		{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}.Release|Win32.Build.0 = Release|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Debug|Win32.Build.0 = Debug|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Release|Win32.ActiveCfg = Release|Win32

-		{799C40A9-9DDB-4DCD-806D-50205508AE0E}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/cpp/sca/samples/PHPCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj b/cpp/sca/samples/PHPCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
deleted file mode 100644
index efc9194822..0000000000
--- a/cpp/sca/samples/PHPCalculator/VSExpress/sample.calculator.client/sample.calculator.client.vcproj
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="sample.calculator.client"

-	ProjectGUID="{799C40A9-9DDB-4DCD-806D-50205508AE0E}"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Debug/Client.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\sample.calculator;&quot;$(TUSCANY_SDOCPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/extensions/cpp/include&quot;;&quot;$(PHP_HOME)/main&quot;;&quot;$(PHP_HOME)/sapi/embed&quot;;&quot;$(PHP_HOME)&quot;;&quot;$(PHP_HOME)/zend&quot;;&quot;$(PHP_HOME)/TSRM&quot;;&quot;$(PHP_SCA_SDO_HOME)&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ZEND_WIN32;PHP_WIN32;ZTS;ZEND_DEBUG=0"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				PrecompiledHeaderFile=".\Debug/Client.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile="Debug/calculator_client.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/calculator_client.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug/Client.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deployclient.bat ..\..\ Debug&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\Release/Client.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="..\..\sample.calculator;&quot;$(TUSCANY_SDOCPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/include&quot;;&quot;$(TUSCANY_SCACPP)/extensions/cpp/include&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/Client.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib $(NOINHERIT)"

-				OutputFile="Release/calculator_client.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				ProgramDatabaseFile=".\Release/calculator_client.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release/Client.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deployclient.bat ..\..\ Release&#x0D;&#x0A;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\sample.calculator.client\CalculatorClient.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/PHPCalculator/VSExpress/sample.calculator/sample.calculator.vcproj b/cpp/sca/samples/PHPCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
deleted file mode 100644
index 939c25e991..0000000000
--- a/cpp/sca/samples/PHPCalculator/VSExpress/sample.calculator/sample.calculator.vcproj
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="sample.calculator"

-	ProjectGUID="{8DD6E7A7-912D-49DD-9517-A91E8FB040D3}"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\Debug"

-			IntermediateDirectory=".\Debug"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="..\..\..\scagen.bat ..\..\sample.calculator"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Debug/Calculator.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="$(TUSCANY_SDOCPP)/include,$(TUSCANY_SCACPP)/include,$(TUSCANY_SCACPP)/extensions/cpp/include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CALCULATOR_EXPORTS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				PrecompiledHeaderFile=".\Debug/Calculator.pch"

-				AssemblerListingLocation=".\Debug/"

-				ObjectFile=".\Debug/"

-				ProgramDataBaseFileName=".\Debug/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sca_cpp.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"

-				OutputFile=".\Debug/Calculator.dll"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/Calculator.pdb"

-				ImportLibrary=".\Debug/Calculator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Debug/Calculator.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deploy.bat "

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\Release"

-			IntermediateDirectory=".\Release"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="..\..\..\scagen.bat ..\..\sample.calculator"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="true"

-				SuppressStartupBanner="true"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/Calculator.tlb"

-				HeaderFileName=""

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="$(TUSCANY_SDOCPP)/include,$(TUSCANY_SCACPP)/include,$(TUSCANY_SCACPP)/extensions/cpp/include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CALCULATOR_EXPORTS"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile=".\Release/Calculator.pch"

-				AssemblerListingLocation=".\Release/"

-				ObjectFile=".\Release/"

-				ProgramDataBaseFileName=".\Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="true"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="2057"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="tuscany_sca_cpp.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"

-				OutputFile=".\Release/Calculator.dll"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="$(TUSCANY_SDOCPP)/lib,$(TUSCANY_SCACPP)/lib,$(TUSCANY_SCACPP)/extensions/cpp/lib"

-				ProgramDatabaseFile=".\Release/Calculator.pdb"

-				ImportLibrary=".\Release/Calculator.lib"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile=".\Release/Calculator.bsc"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="call ..\..\deploy.bat ..\..\ Release"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-			>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_divideService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Proxy.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Wrapper.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl"

-			>

-			<File

-				RelativePath="..\..\sample.calculator\Calculator.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\CalculatorImpl_divideService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\Divide.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Proxy.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\sample.calculator\DivideImpl_DivideService_Wrapper.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/cpp/sca/samples/PHPCalculator/build.xml b/cpp/sca/samples/PHPCalculator/build.xml
deleted file mode 100644
index 37721d3018..0000000000
--- a/cpp/sca/samples/PHPCalculator/build.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_PHPCalculator" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir" location="${basedir}/samples/PHPCalculator"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="build and install the TuscanyScaNative PHPCalculator sample">
-    <antcall target="build"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build"
-          depends="init"
-          description="build the TuscanyScaNative PHPCalculator sample">
-    <echo> The PHPCalculator sample ant build.xml file has not been implemented yet </echo>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative PHPCalculator sample">
-    <echo> The PHPCalculator sample ant build.xml file has not been implemented yet </echo>
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative PHPCalculator sample">
-    <echo> The PHPCalculator sample ant build.xml file has not been implemented yet </echo>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-</project>
diff --git a/cpp/sca/samples/PythonCalculator/build.xml b/cpp/sca/samples/PythonCalculator/build.xml
deleted file mode 100644
index be6d85c70c..0000000000
--- a/cpp/sca/samples/PythonCalculator/build.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_PythonCalculator" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir" location="${basedir}/samples/PythonCalculator"/>
-    <property name="sample.calculator.dir"         location="${this.dir}/sample.calculator"/>
-    <property name="sample.calculator.client.dir"  location="${this.dir}/sample.calculator.client"/>
-
-    <property name="PythonCalculator.install.dir"
-              location="${tuscanySCA.install.dir}/samples/PythonCalculator"/>
-    <property name="sample.calculator.install.dir"
-              location="${PythonCalculator.install.dir}/sample.calculator"/>
-    <property name="sample.calculator.client.install.dir"
-              location="${PythonCalculator.install.dir}/sample.calculator.client"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative PythonCalculator sample">
-    <antcall target="install"/>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative PythonCalculator sample">
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${PythonCalculator.install.dir}"/>
-
-       <!-- install sample.calculator.files -->
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.calculator.dir}"
-        destdir="${sample.calculator.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.calculator.dir}"
-        destdir="${sample.calculator.install.dir}"/>
-
-       <!-- install sample.calculator.client files -->
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${sample.calculator.client.install.dir}"/>
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${sample.calculator.client.install.dir}"
-        executable="true"/>
-
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative PythonCalculator sample">
-    <delete dir="${PythonCalculator.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/PythonWeatherForecast/build.xml b/cpp/sca/samples/PythonWeatherForecast/build.xml
deleted file mode 100644
index ee230e0250..0000000000
--- a/cpp/sca/samples/PythonWeatherForecast/build.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_PythonWeatherForecast" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir" location="${basedir}/samples/PythonWeatherForecast"/>
-    <property name="sample.weather.dir"         location="${this.dir}/sample.weather"/>
-    <property name="sample.weather.client.dir"  location="${this.dir}/sample.weather.client"/>
-
-    <property name="PythonWeather.install.dir"
-              location="${tuscanySCA.install.dir}/samples/PythonWeatherForecast"/>
-    <property name="sample.weather.install.dir"
-              location="${PythonWeather.install.dir}/sample.weather"/>
-    <property name="sample.weather.client.install.dir"
-              location="${PythonWeather.install.dir}/sample.weather.client"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative PythonWeatherForecast sample">
-    <antcall target="install"/>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative PythonWeatherForecast sample">
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${PythonWeather.install.dir}"/>
-
-       <!-- install sample.weather.files -->
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.weather.dir}"
-        destdir="${sample.weather.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.weather.dir}"
-        destdir="${sample.weather.install.dir}"/>
-    <cpp-install-files
-        files="*.wsdl"
-        srcdir="${sample.weather.dir}"
-        destdir="${sample.weather.install.dir}"/>
-
-       <!-- install sample.weather.client files -->
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.weather.client.dir}"
-        destdir="${sample.weather.client.install.dir}"/>
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${sample.weather.client.dir}"
-        destdir="${sample.weather.client.install.dir}"
-        executable="true"/>
-
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative PythonWeatherForecast sample">
-    <delete dir="${PythonWeather.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/RestCalculator/build.xml b/cpp/sca/samples/RestCalculator/build.xml
deleted file mode 100644
index 9a378b7695..0000000000
--- a/cpp/sca/samples/RestCalculator/build.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_RestCalculator" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir"                      location="${basedir}/samples/RestCalculator"/>
-    <property name="sample.calculator.dir"         location="${this.dir}/sample.calculator"/>
-    <property name="sample.calculator.client.dir"  location="${this.dir}/sample.calculator.restclient"/>
-    <property name="sample.httpserver.dir"         location="${this.dir}/httpserver"/>
-
-    <property name="RestCalculator.install.dir"
-              location="${tuscanySCA.install.dir}/samples/RestCalculator"/>
-    <property name="sample.calculator.install.dir"
-              location="${RestCalculator.install.dir}/sample.calculator"/>
-    <property name="sample.calculator.client.install.dir"
-              location="${RestCalculator.install.dir}/sample.calculator.restclient"/>
-    <property name="sample.httpserver.install.dir"
-              location="${RestCalculator.install.dir}/httpserver"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative RestCalculator sample (no build necessary)">
-    <antcall target="install"/>
-  </target>
-
-  <!-- This sample does not require building, just installation -->
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative RestCalculator sample">
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${RestCalculator.install.dir}"/>
-
-       <!-- install sample.calculatur files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${sample.calculator.dir}"
-        destdir="${sample.calculator.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.calculator.dir}"
-        destdir="${sample.calculator.install.dir}"/>
-
-       <!-- install sample.calculatur.restclient files -->
-    <cpp-install-file
-        srcfile="CalculatorRestClient.rb"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${sample.calculator.client.install.dir}"/>
-    <cpp-install-file
-        srcfile="sample.calculator.restclient.composite"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${sample.calculator.client.install.dir}"/>
-    <cpp-install-file
-        srcfile="runrestclient${script.ext}"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${sample.calculator.client.install.dir}"/>
-
-       <!-- install httpserver files -->
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${sample.httpserver.dir}"
-        destdir="${sample.httpserver.install.dir}"
-        executable="true"/>
-    <cpp-install-files
-        files="*.types"
-        srcdir="${sample.httpserver.dir}/conf"
-        destdir="${sample.httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.conf"
-        srcdir="${sample.httpserver.dir}/conf"
-        destdir="${sample.httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.html"
-        srcdir="${sample.httpserver.dir}/htdocs"
-        destdir="${sample.httpserver.install.dir}/htdocs"/>
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative RestCalculator sample">
-    <delete dir="${RestCalculator.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/RestCustomer/build.xml b/cpp/sca/samples/RestCustomer/build.xml
deleted file mode 100644
index 952da3ca23..0000000000
--- a/cpp/sca/samples/RestCustomer/build.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_RestCustomer" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir" location="${basedir}/samples/RestCustomer"/>
-    <property name="sample.customer.dir"         location="${this.dir}/sample.customer"/>
-    <property name="sample.customer.client.dir"  location="${this.dir}/sample.customer.restclient"/>
-    <property name="sample.httpserver.dir"         location="${this.dir}/httpserver"/>
-
-    <property name="RestCustomer.install.dir"
-              location="${tuscanySCA.install.dir}/samples/RestCustomer"/>
-    <property name="sample.customer.install.dir"
-              location="${RestCustomer.install.dir}/sample.customer"/>
-    <property name="sample.customer.client.install.dir"
-              location="${RestCustomer.install.dir}/sample.customer.restclient"/>
-    <property name="sample.httpserver.install.dir"
-              location="${RestCustomer.install.dir}/httpserver"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative RestCustomer sample (no build necessary)">
-    <antcall target="install"/>
-  </target>
-
-  <!-- This sample does not require building, just installation -->
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative RestCustomer sample">
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${RestCustomer.install.dir}"/>
-
-       <!-- install sample.customer files -->
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.customer.dir}"
-        destdir="${sample.customer.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${sample.customer.dir}"
-        destdir="${sample.customer.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.customer.dir}"
-        destdir="${sample.customer.install.dir}"/>
-    <cpp-install-file
-        srcfile="2345.xml"
-        srcdir="${sample.customer.dir}"
-        destdir="${sample.customer.install.dir}"/>
-
-       <!-- install sample.customer.restclient files -->
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.customer.client.dir}"
-        destdir="${sample.customer.client.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${sample.customer.client.dir}"
-        destdir="${sample.customer.client.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.customer.client.dir}"
-        destdir="${sample.customer.client.install.dir}"/>
-    <cpp-install-file
-        srcfile="runrestclient${script.ext}"
-        srcdir="${sample.customer.client.dir}"
-        destdir="${sample.customer.client.install.dir}"/>
-
-       <!-- install httpserver files -->
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${sample.httpserver.dir}"
-        destdir="${sample.httpserver.install.dir}"
-        executable="true"/>
-    <cpp-install-files
-        files="*.types"
-        srcdir="${sample.httpserver.dir}/conf"
-        destdir="${sample.httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.conf"
-        srcdir="${sample.httpserver.dir}/conf"
-        destdir="${sample.httpserver.install.dir}/conf"/>
-    <cpp-install-files
-        files="*.html"
-        srcdir="${sample.httpserver.dir}/htdocs"
-        destdir="${sample.httpserver.install.dir}/htdocs"/>
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative RestCustomer sample">
-    <delete dir="${RestCustomer.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/RestYahoo/build.xml b/cpp/sca/samples/RestYahoo/build.xml
deleted file mode 100644
index 2e9e3b5f26..0000000000
--- a/cpp/sca/samples/RestYahoo/build.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_RestYahoo" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir"                 location="${basedir}/samples/RestYahoo"/>
-    <property name="sample.yahoo.dir"         location="${this.dir}/sample.yahoo"/>
-    <property name="sample.yahoo.client.dir"  location="${this.dir}/sample.yahoo.client"/>
-
-    <property name="RestYahoo.install.dir"
-              location="${tuscanySCA.install.dir}/samples/RestYahoo"/>
-    <property name="sample.yahoo.install.dir"
-              location="${RestYahoo.install.dir}/sample.yahoo"/>
-    <property name="sample.yahoo.client.install.dir"
-              location="${RestYahoo.install.dir}/sample.yahoo.client"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="build and install the TuscanyScaNative RestYahoo sample">
-    <antcall target="install"/>
-  </target>
-
-  <!-- This sample does not require building, just installation -->
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative RestYahoo sample">
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${RestYahoo.install.dir}"/>
-
-       <!-- install sample.yahoo files -->
-    <cpp-install-files
-        files="*.py"
-        srcdir="${sample.yahoo.dir}"
-        destdir="${sample.yahoo.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.yahoo.dir}"
-        destdir="${sample.yahoo.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${sample.yahoo.dir}"
-        destdir="${sample.yahoo.install.dir}"/>
-
-       <!-- install sample.yahoo.client files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${sample.yahoo.client.dir}"
-        destdir="${sample.yahoo.client.install.dir}"/>
-    <cpp-install-file
-        srcfile="runclient${script.ext}"
-        srcdir="${sample.yahoo.client.dir}"
-        destdir="${sample.yahoo.client.install.dir}"/>
-
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative RestYahoo sample">
-    <delete dir="${RestYahoo.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/RubyBigBank/build.xml b/cpp/sca/samples/RubyBigBank/build.xml
deleted file mode 100644
index 886c00e019..0000000000
--- a/cpp/sca/samples/RubyBigBank/build.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_RubyBigBank" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir"                      location="${basedir}/samples/RubyBigBank"/>
-    <property name="bigbank.account.dir"           location="${this.dir}/bigbank.account"/>
-    <property name="bigbank.account.client.dir"    location="${this.dir}/bigbank.client"/>
-    <property name="bigbank.account.wsclient.dir"  location="${this.dir}/bigbank.wsclient"/>
-
-    <property name="RubyBigBank.install.dir"
-              location="${tuscanySCA.install.dir}/samples/RubyBigBank"/>
-    <property name="bigbank.account.install.dir"
-              location="${RubyBigBank.install.dir}/bigbank.account"/>
-    <property name="bigbank.account.client.install.dir"
-              location="${RubyBigBank.install.dir}/bigbank.client"/>
-    <property name="bigbank.account.wsclient.install.dir"
-              location="${RubyBigBank.install.dir}/bigbank.wsclient"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative RubyBigBank sample">
-    <antcall target="install"/>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative RubyBigBank sample">
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${RubyBigBank.install.dir}"/>
-
-       <!-- install bigbank.account.files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-    <cpp-install-files
-        files="*.wsdl"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-    <cpp-install-files
-        files="*.xsd"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"/>
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${bigbank.account.dir}"
-        destdir="${bigbank.account.install.dir}"
-        executable="true"/>
-
-       <!-- install bigbank.account.client files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${bigbank.account.client.dir}"
-        destdir="${bigbank.account.client.install.dir}"/>
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${bigbank.account.client.dir}"
-        destdir="${bigbank.account.client.install.dir}"
-        executable="true"/>
-
-       <!-- install bigbank.account.wsclient files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${bigbank.account.wsclient.dir}"
-        destdir="${bigbank.account.wsclient.install.dir}"/>
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${bigbank.account.wsclient.dir}"
-        destdir="${bigbank.account.wsclient.install.dir}"
-        executable="true"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${bigbank.account.wsclient.dir}"
-        destdir="${bigbank.account.wsclient.install.dir}"/>
-    <cpp-install-files
-        files="*.wsdl"
-        srcdir="${bigbank.account.wsclient.dir}"
-        destdir="${bigbank.account.wsclient.install.dir}"/>
-
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative RubyBigBank sample">
-    <delete dir="${RubyBigBank.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/RubyCalculator/build.xml b/cpp/sca/samples/RubyCalculator/build.xml
deleted file mode 100644
index 2d7eef386e..0000000000
--- a/cpp/sca/samples/RubyCalculator/build.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_RubyCalculator" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir" location="${basedir}/samples/RubyCalculator"/>
-    <property name="sample.calculator.dir"         location="${this.dir}/sample.calculator"/>
-    <property name="sample.calculator.client.dir"  location="${this.dir}/sample.calculator.client"/>
-
-    <property name="RubyCalculator.install.dir"
-              location="${tuscanySCA.install.dir}/samples/RubyCalculator"/>
-    <property name="sample.calculator.install.dir"
-              location="${RubyCalculator.install.dir}/sample.calculator"/>
-    <property name="sample.calculator.client.install.dir"
-              location="${RubyCalculator.install.dir}/sample.calculator.client"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="install the TuscanyScaNative RubyCalculator sample">
-    <antcall target="install"/>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative RubyCalculator sample">
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${this.dir}"
-        destdir="${RubyCalculator.install.dir}"/>
-
-       <!-- install sample.calculator.files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${sample.calculator.dir}"
-        destdir="${sample.calculator.install.dir}"/>
-    <cpp-install-files
-        files="*.composite"
-        srcdir="${sample.calculator.dir}"
-        destdir="${sample.calculator.install.dir}"/>
-    <cpp-install-files
-        files="*.wsdl"
-        srcdir="${sample.calculator.dir}"
-        destdir="${sample.calculator.install.dir}"/>
-
-       <!-- install sample.calculator.client files -->
-    <cpp-install-files
-        files="*.rb"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${sample.calculator.client.install.dir}"/>
-    <cpp-install-files
-        files="*${script.ext}"
-        srcdir="${sample.calculator.client.dir}"
-        destdir="${sample.calculator.client.install.dir}"
-        executable="true"/>
-
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative RubyCalculator sample">
-    <delete dir="${RubyCalculator.install.dir}" quiet="true"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/samples/SupplyChain/build.xml b/cpp/sca/samples/SupplyChain/build.xml
deleted file mode 100644
index a5e887c38b..0000000000
--- a/cpp/sca/samples/SupplyChain/build.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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 name="TuscanyScaNative_Sample_SupplyChain" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <target name="init">
-    <tstamp/>
-    <property name="this.dir" location="${basedir}/samples/SupplyChain"/>
-  </target>
-
-  <!--
-    Public targets
-  -->
-  <target name="all"
-          depends="init"
-          description="build and install the TuscanyScaNative SupplyChain sample">
-    <antcall target="build"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="build"
-          depends="init"
-          description="build the TuscanyScaNative SupplyChain sample">
-    <echo> The SupplyChain sample ant build.xml file has not been implemented yet </echo>
-  </target>
-
-  <target name="install"
-          depends="init"
-          description="Install the TuscanyScaNative SupplyChain sample">
-    <echo> The SupplyChain sample ant build.xml file has not been implemented yet </echo>
-  </target>
-
-  <target name="clean"
-          depends="init"
-          description="Clean the TuscanyScaNative SupplyChain sample">
-    <echo> The SupplyChain sample ant build.xml file has not been implemented yet </echo>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-  -->
-
-</project>
diff --git a/cpp/sca/samples/build.xml b/cpp/sca/samples/build.xml
deleted file mode 100644
index a8422a0e70..0000000000
--- a/cpp/sca/samples/build.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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 name="TuscanyScaNative_samples" default="all" basedir="..">
-
-  <!--
-    This is the root level ant build.xml file for TuscanySCA Native samples
-    Nothing is actually performed here, it just delegates to subdirectory
-    build.xml files.
-  --> 
-    
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-  <property name="this.dir" location="${basedir}/samples"/>
-
-  <property name="AlertAggregator.dir"        location="${this.dir}/AlertAggregator"/>
-  <property name="CppBigBank.dir"             location="${this.dir}/CppBigBank"/>
-  <property name="CppCalculator.dir"          location="${this.dir}/CppCalculator"/>
-  <property name="HttpdBigBank.dir"           location="${this.dir}/HttpdBigBank"/>
-  <property name="PHPCalculator.dir"          location="${this.dir}/PHPCalculator"/>
-  <property name="PythonCalculator.dir"       location="${this.dir}/PythonCalculator"/>
-  <property name="PythonWeatherForecast.dir"  location="${this.dir}/PythonWeatherForecast"/>
-  <property name="RestCalculator.dir"         location="${this.dir}/RestCalculator"/>
-  <property name="RestCustomer.dir"           location="${this.dir}/RestCustomer"/>
-  <property name="RestYahoo.dir"              location="${this.dir}/RestYahoo"/>
-  <property name="RubyBigBank.dir"            location="${this.dir}/RubyBigBank"/>
-  <property name="RubyCalculator.dir"         location="${this.dir}/RubyCalculator"/>
-  <property name="SupplyChain.dir"            location="${this.dir}/SupplyChain"/>
-
-  <!--
-    Public targets
-  -->
-
-  <target name="all" description="Build and install all TuscanyScaNative samples">
-    <antcall target="AlertAggregator"/>
-    <antcall target="CppBigBank"/>
-    <antcall target="CppCalculator"/>
-    <antcall target="HttpdBigBank"/>
-    <antcall target="PHPCalculator"/>
-    <antcall target="PythonCalculator"/>
-    <antcall target="PythonWeatherForecast"/>
-    <antcall target="RestCalculator"/>
-    <antcall target="RestCustomer"/>
-    <antcall target="RestYahoo"/>
-    <antcall target="RubyBigBank"/>
-    <antcall target="RubyCalculator"/>
-    <antcall target="SupplyChain"/>
-  </target>
-
-       <!--
-         Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings
-       -->
-
-  <target name="AlertAggregator" description="Build and install the AlertAggregator sample">
-    <ant target="all" antfile="${AlertAggregator.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="CppBigBank" description="Build and install the CppBigBank sample">
-    <ant target="all" antfile="${CppBigBank.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="CppCalculator" description="Build and install the CppCalculator sample">
-    <ant target="all" antfile="${CppCalculator.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="HttpdBigBank" description="Build and install the HttpdBigBank sample">
-    <ant target="all" antfile="${HttpdBigBank.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="PHPCalculator" description="Build and install the PHPCalculator sample">
-    <ant target="all" antfile="${PHPCalculator.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="PythonCalculator" description="Build and install the PythonCalculator sample">
-    <ant target="all" antfile="${PythonCalculator.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="PythonWeatherForecast" description="Build and install the PythonWeatherForecast sample">
-    <ant target="all" antfile="${PythonWeatherForecast.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="RestCalculator" description="Build and install the RestCalculator sample">
-    <ant target="all" antfile="${RestCalculator.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="RestCustomer" description="Build and install the RestCustomer sample">
-    <ant target="all" antfile="${RestCustomer.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="RestYahoo" description="Build and install the RestYahoo sample">
-    <ant target="all" antfile="${RestYahoo.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="RubyBigBank" description="Build and install the RubyBigBank sample">
-    <ant target="all" antfile="${RubyBigBank.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="RubyCalculator" description="Build and install the RubyCalculator sample">
-    <ant target="all" antfile="${RubyCalculator.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="SupplyChain" description="Build and install the SupplyChain sample">
-    <ant target="all" antfile="${SupplyChain.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean" description="Clean all TuscanyScaNative samples">
-    <ant target="clean" antfile="${AlertAggregator.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${CppBigBank.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${CppCalculator.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${HttpdBigBank.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${PHPCalculator.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${PythonCalculator.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${PythonWeatherForecast.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${RestCalculator.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${RestCustomer.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${RestYahoo.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${RubyBigBank.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${RubyCalculator.dir}/build.xml" inheritAll="false"/>
-    <ant target="clean" antfile="${SupplyChain.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/tools/TuscanyDriver/build.xml b/cpp/sca/tools/TuscanyDriver/build.xml
deleted file mode 100644
index 9ccdb2b833..0000000000
--- a/cpp/sca/tools/TuscanyDriver/build.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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 name="tuscanyDriver" default="all" basedir="../..">
-
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <property name="tuscanyServiceLoader.app" value="tuscanyServiceLoader"/>
-  <property name="tuscanyServiceLoader.files" value="TuscanyServiceLoader.cpp CommandLineProcessor.cpp main.cpp"/>
-  <property name="this.dir" location="${basedir}/tools/TuscanyDriver"/>
-  <property name="bin.dir" location="${this.dir}/bin"/>
-  <property name="install.dir" location="${tuscanySCA.install.dir}/bin"/>
-
-  <!--
-    Public targets
-  -->
-  <target name="all" description="Compile, Link, and Install the TuscanyServiceLoader">
-    <antcall target="build"/>
-    <antcall target="install"/>
-  </target>
-
-  <target name="clean" description="Remove the TuscanyServiceLoader installation">
-    <sequential>
-      <delete dir="${bin.dir}"/>
-      <delete file="${install.dir}/${tuscanyServiceLoader.app}${exe.ext}"/>
-    </sequential>
-  </target>
-
-  <!--
-    Internal targets
-  -->
-  <target name="build">
-    <sequential>
-      <cpp-build
-          srcdir="${this.dir}"
-          infiles="${tuscanyServiceLoader.files}"
-          outdir="${bin.dir}"
-          outfile="${tuscanyServiceLoader.app}"
-          outtype="executable">
-        <custom-build-elements>
-          <libset dir="${tuscanySCA.install.dir}/lib" libs="tuscany_sca"/>
-          <syslibset if="unix" libs="dl"/>
-        </custom-build-elements>
-      </cpp-build>
-    </sequential>
-  </target>
-
-  <target name="install">
-    <cpp-install-file
-        srcfile="${tuscanyServiceLoader.app}${exe.ext}"
-        srcdir="${bin.dir}"
-        destdir="${install.dir}"/>
-  </target>
-
-</project>
diff --git a/cpp/sca/tools/ant_cpptasks/build.xml b/cpp/sca/tools/ant_cpptasks/build.xml
deleted file mode 100644
index 69d85ecca2..0000000000
--- a/cpp/sca/tools/ant_cpptasks/build.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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 name="org.apache.tuscany.sca.cpp.antCompilers" default="all" basedir="../..">

-

-	<import file="${basedir}/antscripts/system.xml"/>

-	<import file="${basedir}/antscripts/compile-targets.xml"/>

-	

-	<target name="init">

-		<tstamp/>

-		<property name="this.dir"        location="${basedir}/tools/ant_cpptasks"/>

-		<property name="build.dir"       location="${this.dir}/build" />

-	  <property name="java.src.dir"    location="${this.dir}/tuscanyAntCompilers" />

-	  <property name="install.dir"     location="${basedir}/antscripts" />

-		<property name="class.name"       value="TuscanyMSVC8DevStudioCCompiler" />

-	</target>

-

-	<target name="all" depends="init,build,install"/>

-

-	<target name="build" depends="init" description="Build tuscany ant msvc 8.0 compiler task">

-		<mkdir dir="${build.dir}" />

-

-		<!-- compile the source code -->

-		<javac srcdir="${java.src.dir}"

-			     destdir="${build.dir}"

-		       failonerror="true"

-           includeAntRuntime="no">

-		  <classpath>

-		    <pathelement path="${env.ANT_HOME}/lib/cpptasks.jar"/>

-		    <pathelement path="${env.ANT_HOME}/lib/ant.jar"/>

-		  </classpath>

-		</javac>

-	</target>

-

-  <target name="make.jar" depends="init,build">

-    <jar jarfile="${build.dir}/${class.name}.jar"

-         basedir="${build.dir}"

-         includes="tuscany/antCompilers/${class.name}.class">

-      <manifest>

-        <attribute name="Main-Class" value="tuscany.antCompilers.${class.name}" />

-      </manifest>

-    </jar>

-  </target>

-

-	<target name="install" depends="init,make.jar">

-    <mkdir dir="${install.dir}"/>

-    <copy todir="${install.dir}" overwrite='true'>

-      <fileset dir="${build.dir}" includes="${class.name}.jar"/>

-    </copy>

-  </target>

-	

-	<target name="clean" depends="init" description="Clean of all the files created.">

-		<delete dir="${build.dir}" quiet="true"/>

-    <delete file="${install.dir}/${class.name}.jar" quiet="true"/>

-	</target>

-

-</project>

diff --git a/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java b/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
deleted file mode 100644
index 981592a2a2..0000000000
--- a/cpp/sca/tools/ant_cpptasks/tuscanyAntCompilers/TuscanyMSVC8DevStudioCCompiler.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * 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 tuscany.antCompilers;
-
-import java.io.File;
-import java.util.Vector;
-
-import net.sf.antcontrib.cpptasks.CUtil;
-import net.sf.antcontrib.cpptasks.OptimizationEnum;
-
-import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
-import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
-import net.sf.antcontrib.cpptasks.compiler.Linker;
-import net.sf.antcontrib.cpptasks.compiler.LinkType;
-import net.sf.antcontrib.cpptasks.compiler.PrecompilingCommandLineCCompiler;
-import net.sf.antcontrib.cpptasks.compiler.Processor;
-
-import net.sf.antcontrib.cpptasks.devstudio.DevStudioProcessor;
-import net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.Environment;
-
-
-/**
- * An abstract base class for compilers that are basically command line
- * compatible with Microsoft(r) C/C++ Optimizing Compiler
- * 
- * This class was taken from cpptasks. Its a combination of the following 2 classes:
- *     net.sf.antcontrib.cpptasks.devstudio.DevStudioCompatibleCCompiler
- *     net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler
- *
- * To compile MSVC8.0 in debug mode, the cpptasks msvc compiler doesnt distinguish
- * between msvc 7.1 and 8.0 and seems to actually be 7.1 centric. This implementation
- * For the Apache Tuscany project tries to address those issues. 
- */
-
-public final class TuscanyMSVC8DevStudioCCompiler
-        extends PrecompilingCommandLineCCompiler
-{
-    private static String[] mflags_ = 
-    	new String[] {"/ML", "/MLd", null, null, "/MT", "/MTd", "/MD", "/MDd"};
-    //   first four are single-threaded
-    //      (runtime=static,debug=false), (..,debug=true),
-    //      (runtime=dynamic,debug=true), (..,debug=false), (not supported)
-    //    next four are multi-threaded, same sequence
-
-	  // Indeces into the mflags_ array 
-	private static int MINDEX_DEBUG           =  1;
-	private static int MINDEX_STATIC_RUNTIME  =  2;
-	private static int MINDEX_MULTI_THREADED  =  4;
-
-	private static final TuscanyMSVC8DevStudioCCompiler instance_ = 
-		new TuscanyMSVC8DevStudioCCompiler( "cl", false, null);
-
-    public static TuscanyMSVC8DevStudioCCompiler getInstance()
-    {
-        return instance_;
-    }
-
-    private TuscanyMSVC8DevStudioCCompiler(
-    		String command,
-    		boolean newEnvironment,
-            Environment env)
-    {
-        super(command, 
-              "/bogus",
-              new String[]{".c", ".cc", ".cpp", ".cxx", ".c++"},
-              new String[]{".h", ".hpp", ".inl"},
-              ".obj",
-              false,
-              null,
-              newEnvironment,
-              env);
-    }
-
-    public Processor changeEnvironment(boolean newEnvironment, Environment env)
-    {
-        if (newEnvironment || env != null) {
-            return new TuscanyMSVC8DevStudioCCompiler(getCommand(), newEnvironment, env);
-        }
-        return this;
-    }
-
-    public Linker getLinker(LinkType type)
-    {
-        return DevStudioLinker.getInstance().getLinker(type);
-    }
-
-    public int getMaximumCommandLength()
-    {
-        return 32767;
-    }
-
-    protected void addImpliedArgs(
-    		final Vector args,
-            final boolean debug,
-            final boolean multithreaded,
-            final boolean exceptions,
-            final LinkType linkType,
-            final Boolean rtti,
-            final OptimizationEnum optimization)
-    {
-        args.addElement("/c");
-        args.addElement("/nologo");
-        if (exceptions) {
-            //   changed to eliminate warning on VC 2005, should support VC 6 and later
-            //   use /GX to support VC5 - 2005 (with warning)
-            args.addElement("/EHsc");
-        }
-        int mindex = 0;
-        if (multithreaded) {
-            mindex += MINDEX_MULTI_THREADED;
-        }
-        boolean staticRuntime = linkType.isStaticRuntime();
-        if (!staticRuntime) {
-            mindex += MINDEX_STATIC_RUNTIME;
-        }
-
-        if (debug) {
-            mindex += MINDEX_DEBUG;
-            args.addElement("/Zi");        // Generates complete debugging information
-            args.addElement("/Od");        // Disables optimization
-            args.addElement("/RTC1");      // Enables run-time error checking as opposed to depracated /GZ
-            args.addElement("/Gd");        // Uses the __cdecl calling convention (x86 only)
-            args.addElement("/D_DEBUG");   // Debug mode
-        } else {
-            args.addElement("/DNDEBUG");
-            if (optimization != null) {
-                if (optimization.isSize()) {
-                    args.addElement("/O1");
-                }
-
-                if (optimization.isSpeed()) {
-                    args.addElement("/O2");
-                }
-            }
-        }
-
-        String mflag = mflags_[mindex];
-        if (mflag == null) {
-            throw new BuildException(
-                    "multithread='false' and runtime='dynamic' not supported");
-        }
-        args.addElement(mflag);
-        if (rtti != null && rtti.booleanValue()) {
-                args.addElement("/GR");
-        }
-    }
-
-    protected void addWarningSwitch(Vector args, int level)
-    {
-        DevStudioProcessor.addWarningSwitch(args, level);
-    }
-
-    protected CompilerConfiguration createPrecompileGeneratingConfig(
-            CommandLineCompilerConfiguration baseConfig,
-            File prototype,
-            String lastInclude)
-    {
-        String[] additionalArgs = new String[]{
-                "/Fp" + CUtil.getBasename(prototype) + ".pch", "/Yc"};
-        return new
-            CommandLineCompilerConfiguration(
-        		baseConfig,
-        		additionalArgs,
-                null,
-                true);
-    }    
-
-    protected CompilerConfiguration createPrecompileUsingConfig(
-            CommandLineCompilerConfiguration baseConfig,
-            File prototype,
-            String lastInclude,
-            String[] exceptFiles)
-    {
-        String[] additionalArgs = new String[]{
-                "/Fp" + CUtil.getBasename(prototype) + ".pch",
-                "/Yu" + lastInclude};
-        return new
-            CommandLineCompilerConfiguration(
-        		baseConfig,
-        		additionalArgs,
-                exceptFiles,
-                false);
-    }
-
-    protected void getDefineSwitch(StringBuffer buffer, String define, String value)
-    {
-        DevStudioProcessor.getDefineSwitch(buffer, define, value);
-    }
-
-    protected File[] getEnvironmentIncludePath()
-    {
-        return CUtil.getPathFromEnvironment("INCLUDE", ";");
-    }
-
-    protected String getIncludeDirSwitch(String includeDir)
-    {
-        return DevStudioProcessor.getIncludeDirSwitch(includeDir);
-    }
-
-    protected void getUndefineSwitch(StringBuffer buffer, String define)
-    {
-        DevStudioProcessor.getUndefineSwitch(buffer, define);
-    }
-}
diff --git a/cpp/sca/tools/build.xml b/cpp/sca/tools/build.xml
deleted file mode 100644
index 1e5b496c94..0000000000
--- a/cpp/sca/tools/build.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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 name="TuscanyScaNative_tools" default="all" basedir="..">
-
-  <!--
-    This is the root level ant build.xml file for TuscanySCA Native tools
-    Nothing is actually performed here, it just delegates to subdirectory
-    build.xml files.
-  --> 
-    
-  <import file="${basedir}/antscripts/system.xml"/>
-  <import file="${basedir}/antscripts/compile-targets.xml"/>
-
-  <!--
-    Notice that the basedir for this project is set to the TuscanySCA root dir
-    This makes path setting in system.xml much simpler, but we'll just have to
-    set a property here to this directory.
-  -->
-
-  <property name="this.dir"           location="${basedir}/tools"/>
-  <property name="TuscanyDriver.dir"  location="${this.dir}/TuscanyDriver"/>
-  <property name="ant_cpptasks.dir"   location="${this.dir}/ant_cpptasks"/>
-
-  <!--
-    Public targets
-  -->
-
-  <target name="all" description="Build and install all TuscanyScaNative tools">
-    <antcall target="build"/>
-    <antcall target="install"/>
-  </target>
-
-     <!--
-       Notice the ant_cpptasks tool is not included in the "all" target.
-       This is because its not something that should be built that often.
-       The resulting jar is included in TUSCANY_SCA_SRC_ROOT/antscripts svn
-     -->
-
-  <target name="build" description="Build all TuscanyScaNative tools">
-    <antcall target="build.TuscanyDriver"/>
-  </target>
-
-  <target name="install" description="Install TuscanyScaNative tools">
-    <antcall target="install.TuscanyDriver"/>
-  </target>
-
-  <target name="clean" description="Clean all TuscanyScaNative tools">
-    <antcall target="clean.TuscanyDriver"/>
-  </target>
-
-  <!--
-    Internal targets
-    They can still be called, they're just not described, so wont show up in "ant -p"
-    Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings
-  -->
-
-    <!-- build -->
-
-  <target name="build.ant_cpptasks">
-    <ant target="build" antfile="${ant_cpptasks.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="build.TuscanyDriver">
-    <ant target="build" antfile="${TuscanyDriver.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-    <!-- install -->
-
-  <target name="install.ant_cpptasks">
-    <ant target="install" antfile="${ant_cpptasks.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="install.TuscanyDriver">
-    <ant target="install" antfile="${TuscanyDriver.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-    <!-- clean -->
-
-  <target name="clean.ant_cpptasks">
-    <ant target="clean" antfile="${ant_cpptasks.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-  <target name="clean.TuscanyDriver">
-    <ant target="clean" antfile="${TuscanyDriver.dir}/build.xml" inheritAll="false"/>
-  </target>
-
-</project>