Moved some sources up in the directory tree to attempt to simplify the directory structure a bit, and some minor refactoring.

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

52 files changed, 1 insertions, 6393 deletions

diff --git a/cpp/sca/runtime/Makefile.am b/cpp/sca/runtime/Makefile.am
index 8b13058152..a03650cd83 100644
--- a/cpp/sca/runtime/Makefile.am
+++ b/cpp/sca/runtime/Makefile.am
@@ -16,3 +16,4 @@
 #  under the License.
 
 SUBDIRS = core extensions
+
diff --git a/cpp/sca/runtime/core/src/Makefile.am b/cpp/sca/runtime/core/src/Makefile.am
index 63c0a1e083..ebba243583 100644
--- a/cpp/sca/runtime/core/src/Makefile.am
+++ b/cpp/sca/runtime/core/src/Makefile.am
@@ -18,7 +18,6 @@
 lib_LTLIBRARIES = libtuscany_sca.la
 
 nobase_include_HEADERS = \
-tuscany/*.hpp \
 tuscany/sca/*.h \
 tuscany/sca/core/*.h \
 tuscany/sca/model/*.h \
diff --git a/cpp/sca/runtime/core/src/tuscany/function.hpp b/cpp/sca/runtime/core/src/tuscany/function.hpp
deleted file mode 100644
index caba5211b9..0000000000
--- a/cpp/sca/runtime/core/src/tuscany/function.hpp
+++ /dev/null
@@ -1,232 +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.
- */
-
-/* $Rev$ $Date$ */
-
-#ifndef tuscany_function_hpp
-#define tuscany_function_hpp
-
-/**
- * Lambda function type.
- */
-
-#include <iostream>
-#include "gc.hpp"
-
-namespace tuscany {
-
-/**
- * Debug counters.
- */
-long int countProxies;
-long int countFProxies = 0;
-long int countCProxies = 0;
-long int countLambdas = 0;
-long int countELambdas = 0;
-long int countCLambdas = 0;
-long int countFLambdas = 0;
-
-bool resetLambdaCounters() {
-    countLambdas = countELambdas = countCLambdas = countFLambdas = countProxies = countFProxies = countCProxies = 0;
-    return true;
-}
-
-bool printLambdaCounters() {
-    std::cout << "countLambdas " << countLambdas << std::endl;
-    std::cout << "countELambdas " << countELambdas << std::endl;
-    std::cout << "countFLambdas " << countFLambdas << std::endl;
-    std::cout << "countCLambdas " << countCLambdas << std::endl;
-    std::cout << "countProxies " << countProxies << std::endl;
-    std::cout << "countFProxies " << countFProxies << std::endl;
-    std::cout << "countCProxies " << countCProxies << std::endl;
-    return true;
-}
-
-/**
- * Lambda function type.
- */
-
-template<typename R, typename... P> class Callable {
-public:
-    unsigned int refCount;
-
-    Callable() : refCount(0) {
-    }
-
-    virtual const int size() const = 0;
-
-    virtual const R operator()(P... p) const = 0;
-
-    virtual ~Callable() {
-    }
-
-    unsigned int acquire() {
-        return __sync_add_and_fetch(&refCount, 1);
-    }
-
-    unsigned int release() {
-        return __sync_sub_and_fetch(&refCount, 1);
-    }
-
-    template<typename F> class Proxy: public Callable {
-    public:
-        explicit Proxy(const F& f) : function(f) {
-            countProxies++;
-            countFProxies ++;
-        }
-
-        explicit Proxy(const Proxy& p) : function(p.function) {
-            countProxies++;
-            countCProxies ++;
-        }
-
-        ~Proxy() {
-            countProxies--;
-        }
-
-        virtual const R operator() (P... p) const {
-            return function(std::forward<P>(p)...);
-        }
-
-        virtual const int size() const {
-            return sizeof(function);
-        }
-
-    private:
-        const F function;
-    };
-
-};
-
-template<typename S> class lambda;
-
-template<typename R, typename... P> class lambda<R(P...)> {
-public:
-    lambda() : callable(0) {
-        countLambdas++;
-        countELambdas++;
-    }
-
-    template<typename F> explicit lambda(const F f) : callable(0) {
-        typedef typename CallableType::template Proxy<F> ProxyType;
-
-        countLambdas++;
-        countFLambdas++;
-        callable = gc_counting_ptr<CallableType>(new ProxyType(f));
-    }
-
-    lambda(const lambda& l) {
-        countLambdas++;
-        countCLambdas++;
-        callable = l.callable;
-    }
-
-    const lambda& operator=(const lambda& l) {
-        if (this == &l)
-        return *this;
-        callable = l.callable;
-        return *this;
-    }
-
-    ~lambda() {
-        countLambdas--;
-    }
-
-    const bool operator==(const lambda& l) const {
-        if (this == &l)
-        return true;
-        return callable == l.callable;
-    }
-
-    const bool operator!=(const lambda& l) const {
-        return !this->operator==(l);
-    }
-
-    const R operator()(P... p) const {
-        return (*callable)(std::forward<P>(p)...);
-    }
-
-    template<typename S> friend std::ostream& operator<<(std::ostream&, const lambda<S>&);
-
-private:
-    typedef Callable<R,P...> CallableType;
-    gc_counting_ptr<CallableType> callable;
-};
-
-template<typename S> std::ostream& operator<<(std::ostream& out, const lambda<S>& l) {
-    return out << "lambda::" << l.callable;
-}
-
-/**
- * Creates a lambda function from a pointer to a function.
- */
-template<typename R, typename... P> lambda<R(P...)> makeLambda(const R (* const f)(P...)) {
-    return lambda<R(P...)>(f);
-}
-
-/**
- * Curry a lambda function.
- */
-template<typename R, typename T, typename... P> class curried {
-public:
-    curried(const lambda<R(T, P...)>& f, const T& v): v(v), f(f) {
-    }
-
-    const R operator()(P... p) const {
-        return f(v, std::forward<P>(p)...);
-    }
-
-private:
-    const T v;
-    const lambda<R(T, P...)>f;
-};
-
-template<typename R, typename T, typename... P> const lambda<R(P...)> curry(const lambda<R(T, P...)>& f, const T& t) {
-    return (lambda<R(P...)>)curried<R, T, P...>(f, t);
-}
-
-template<typename R, typename T, typename U, typename... P> const lambda<R(P...)> curry(const lambda<R(T, U, P...)>& f, const T& t, const U& u) {
-    return curry(curry(f, t), u);
-}
-
-template<typename R, typename T, typename U, typename V, typename... P> const lambda<R(P...)> curry(const lambda<R(T, U, P...)>& f, const T& t, const U& u, const V& v) {
-    return curry(curry(curry(f, t), u), v);
-}
-
-/**
- * A lambda function that returns the given value.
- */
-template<typename T> class unitReturn {
-public:
-    explicit unitReturn(const T& v) :
-        v(v) {
-    }
-    const T operator()() const {
-        return v;
-    }
-private:
-    const T v;
-};
-
-template<typename T> const lambda<T()> unit(const T& v) {
-    return lambda<T()> (unitReturn<T> (v));
-}
-
-}
-#endif /* tuscany_function_hpp */
diff --git a/cpp/sca/runtime/core/src/tuscany/gc.hpp b/cpp/sca/runtime/core/src/tuscany/gc.hpp
deleted file mode 100644
index b0ed42a474..0000000000
--- a/cpp/sca/runtime/core/src/tuscany/gc.hpp
+++ /dev/null
@@ -1,269 +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.
- */
-
-/* $Rev$ $Date$ */
-
-#ifndef tuscany_gc_hpp
-#define tuscany_gc_hpp
-
-/**
- * Garbage collected pointer.
- */
-
-#include <iostream>
-
-namespace tuscany
-{
-
-template<typename T> class gc_ptr {
-public:
-    explicit gc_ptr(T* p = 0) throw() : countingRef(p == 0? 0 : new CountingRef(p)) {
-    }
-
-    ~gc_ptr() throw() {
-        release();
-    }
-
-    gc_ptr(const gc_ptr& r) throw() : countingRef(r.countingRef) {
-        acquire(r.countingRef);
-    }
-
-    gc_ptr& operator=(const gc_ptr& r) throw() {
-        if(this == &r)
-            return *this;
-        acquire(r.countingRef);
-        release();
-        countingRef = r.countingRef;
-        return *this;
-    }
-
-    const bool operator==(const gc_ptr& r) const throw() {
-        if (this == &r)
-            return true;
-        if (countingRef == NULL)
-            return r.countingRef == NULL;
-        if (r.countingRef == NULL)
-            return false;
-        return countingRef-> ptr == r.countingRef->ptr;
-    }
-
-    const bool operator!=(const gc_ptr& r) const throw() {
-        return !this->operator ==(r);
-    }
-
-    T& operator*() const throw() {
-        return *countingRef->ptr;
-    }
-
-    T* operator->() const throw() {
-        return countingRef->ptr;
-    }
-
-    operator T*() const throw() {
-        return countingRef->ptr;
-    }
-
-    template<typename X> friend std::ostream& operator<<(std::ostream&, const gc_ptr<X>&);
-
-private:
-    struct CountingRef {
-        T* ptr;
-        unsigned count;
-
-        CountingRef(T* p) throw() :
-            ptr(p), count(1) {
-        }
-    }* countingRef;
-
-    void acquire(CountingRef* ref) throw() {
-        if(ref)
-            __sync_add_and_fetch(&ref->count, 1);
-    }
-
-    void release() throw() {
-        if(countingRef) {
-            unsigned rc = __sync_sub_and_fetch(&countingRef->count, 1);
-            if(rc == 0) {
-                delete countingRef->ptr;
-                delete countingRef;
-            }
-        }
-    }
-};
-
-template<typename T> std::ostream& operator<<(std::ostream& out, const gc_ptr<T>& p) {
-    return out << p.countingRef->ptr;
-}
-
-/**
- * Garbage collected pointer to an array.
- */
-template<typename T> class gc_aptr {
-public:
-    explicit gc_aptr(T* p = 0) throw() : countingRef(p == 0? 0 : new CountingRef(p)) {
-    }
-
-    ~gc_aptr() throw() {
-        release();
-    }
-
-    gc_aptr(const gc_aptr& r) throw() : countingRef(r.countingRef) {
-        acquire(r.countingRef);
-    }
-
-    gc_aptr& operator=(const gc_aptr& r) throw() {
-        if(this == &r)
-            return *this;
-        acquire(r.countingRef);
-        release();
-        countingRef = r.countingRef;
-        return *this;
-    }
-
-    const bool operator==(const gc_aptr& r) const throw() {
-        if (this == &r)
-            return true;
-        if (countingRef == NULL)
-            return r.countingRef == NULL;
-        if (r.countingRef == NULL)
-            return false;
-        return countingRef-> ptr == r.countingRef->ptr;
-    }
-
-    const bool operator!=(const gc_aptr& r) const throw() {
-        return !this->operator ==(r);
-    }
-
-    T& operator*() const throw() {
-        return *countingRef->ptr;
-    }
-
-    T* operator->() const throw() {
-        return countingRef->ptr;
-    }
-
-    operator T*() const throw() {
-        return countingRef->ptr;
-    }
-
-    template<typename X> friend std::ostream& operator<<(std::ostream&, const gc_aptr<X>&);
-
-private:
-    struct CountingRef {
-        T* ptr;
-        unsigned count;
-
-        CountingRef(T* p) throw() :
-            ptr(p), count(1) {
-        }
-    }* countingRef;
-
-    void acquire(CountingRef* ref) throw() {
-        if(ref)
-            __sync_add_and_fetch(&ref->count, 1);
-    }
-
-    void release() throw() {
-        if(countingRef) {
-            unsigned rc = __sync_sub_and_fetch(&countingRef->count, 1);
-            if(rc == 0) {
-                delete[] countingRef->ptr;
-                delete countingRef;
-            }
-        }
-    }
-};
-
-template<typename T> std::ostream& operator<<(std::ostream& out, const gc_aptr<T>& p) {
-    return out << p.countingRef->ptr;
-}
-
-/**
- * Garbage collected pointer to a reference counting object.
- */
-template<typename T> class gc_counting_ptr {
-public:
-    explicit gc_counting_ptr(T* p = 0) throw() : ptr(p) {
-        acquire(p);
-    }
-
-    ~gc_counting_ptr() throw() {
-        release();
-    }
-
-    gc_counting_ptr(const gc_counting_ptr& r) throw() : ptr(r.ptr) {
-        acquire(ptr);
-    }
-
-    gc_counting_ptr& operator=(const gc_counting_ptr& r) throw() {
-        if(this == &r)
-            return *this;
-        acquire(r.ptr);
-        release();
-        ptr = r.ptr;
-        return *this;
-    }
-
-    const bool operator==(const gc_counting_ptr& r) const throw() {
-        if (this == &r)
-            return true;
-        return ptr == r.ptr;
-    }
-
-    const bool operator!=(const gc_counting_ptr& r) const throw() {
-        return !this->operator ==(r);
-    }
-
-    T& operator*() const throw() {
-        return *ptr;
-    }
-
-    T* operator->() const throw() {
-        return ptr;
-    }
-
-    operator T*() const throw() {
-        return ptr;
-    }
-
-    template<typename X> friend std::ostream& operator<<(std::ostream&, const gc_counting_ptr<X>&);
-
-private:
-    T* ptr;
-
-    void acquire(T* p) throw() {
-        if(p)
-            p->acquire();
-    }
-
-    void release() throw() {
-        if(ptr) {
-            if(ptr->release() == 0) {
-                delete ptr;
-            }
-        }
-    }
-};
-
-template<typename T> std::ostream& operator<<(std::ostream& out, const gc_counting_ptr<T>& p) {
-    return out << p.ptr;
-}
-
-}
-#endif /* tuscany_gc_hpp */
diff --git a/cpp/sca/runtime/core/src/tuscany/list.hpp b/cpp/sca/runtime/core/src/tuscany/list.hpp
deleted file mode 100644
index ef493b19ca..0000000000
--- a/cpp/sca/runtime/core/src/tuscany/list.hpp
+++ /dev/null
@@ -1,379 +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.
- */
-
-/* $Rev$ $Date$ */
-
-#ifndef tuscany_list_hpp
-#define tuscany_list_hpp
-
-/**
- * Simple list functions.
- */
-
-#include <iostream>
-#include "function.hpp"
-
-namespace tuscany {
-
-long countlists = 0;
-long countIlists = 0;
-long countClists = 0;
-long countElists = 0;
-
-bool resetlistCounters() {
-    countlists = countIlists = countClists = countElists = 0;
-    return true;
-}
-
-bool printlistCounters() {
-    std::cout << "countlists " << countlists << std::endl;
-    std::cout << "countElists " << countElists << std::endl;
-    std::cout << "countIlists " << countIlists << std::endl;
-    std::cout << "countClists " << countClists << std::endl;
-    return true;
-}
-
-/**
- * A car/cdr lisp-like pair, base structure to construct lists.
- */
-
-template<typename T> class list {
-public:
-
-    list(const T car, const lambda<list<T> ()>& cdr) :
-        nil(false), car(car), cdr(cdr) {
-        countlists++;
-        countIlists++;
-    }
-
-    list() :
-        nil(true) {
-        countlists++;
-        countElists++;
-    }
-
-    list(const list& p) :
-        nil(p.nil), car(p.car), cdr(p.cdr) {
-        countlists++;
-        countClists++;
-    }
-
-    const list& operator=(const list<T>& p) {
-        if(this == &p)
-            return *this;
-        nil = p.nil;
-        car = p.car;
-        cdr = p.cdr;
-        return *this;
-    }
-
-    ~list() {
-        countlists--;
-    }
-
-    const bool operator==(const list<T>& p) const {
-        if(this == &p)
-            return true;
-        if(nil)
-            return p.nil;
-        if(p.nil)
-            return false;
-        if(!(car == p.car))
-            return false;
-        if(cdr == p.cdr)
-            return true;
-        return cdr() == p.cdr();
-    }
-
-    const bool operator!=(const list<T>& p) const {
-        return !this->operator==(p);
-    }
-
-    template<typename X> friend std::ostream& operator<<(std::ostream&, const list<X>&);
-
-    bool nil;
-    T car;
-    lambda<list<T> ()> cdr;
-};
-
-/**
- * Returns true if the given list is nil.
- */
-template<typename T> const bool isNil(const list<T>& p) {
-    return p.nil;
-}
-
-/**
- * Write a list to an output stream.
- */
-template<typename X> std::ostream& operator<<(std::ostream& out, const list<X>& l) {
-    if(l == list<X> ())
-        return out << "()";
-    return out << "(" << car(l) << ", " << cdr(l) << ")";
-}
-
-/**
- * Construct a (lazy) list from a value and a lambda function that returns the cdr.
- */
-template<typename T> const list<T> cons(const T& car, const lambda<list<T> ()>& cdr) {
-    return list<T> (car, cdr);
-}
-
-/**
- * Construct a list from a value and a cdr list.
- */
-template<typename T> const list<T> cons(const T& car, const list<T>& cdr) {
-    return list<T> (car, unit(cdr));
-}
-
-/**
- * Construct a list of one value.
- */
-template<typename T> const list<T> makeList(const T& car) {
-    return list<T> (car, unit(list<T> ()));
-}
-
-/**
- * Construct a list of two values.
- */
-template<typename T> const list<T> makeList(const T& a, const T& b) {
-    return cons(a, makeList(b));
-}
-
-/**
- * Construct a list of three values.
- */
-template<typename T> const list<T> makeList(const T& a, const T& b, const T& c) {
-    return cons(a, cons(b, makeList(c)));
-}
-
-/**
- * Construct a list of four values.
- */
-template<typename T> const list<T> makeList(const T& a, const T& b, const T& c, const T& d) {
-    return cons(a, cons(b, cons(c, makeList(d))));
-}
-
-/**
- * Returns the car of a list.
- */
-template<typename T> const T car(const list<T>& p) {
-    return p.car;
-}
-
-/**
- * Returns the cdr of a list.
- */
-template<typename T> list<T> const cdr(const list<T>& p) {
-    return p.cdr();
-}
-
-/**
- * Returns the car of the cdr of a list.
- */
-template<typename T> const T cadr(const list<T>& p) {
-    return car(cdr(p));
-}
-
-/**
- * Returns the car of the cdr of the cdr of a list.
- */
-template<typename T> const T caddr(const list<T>& p) {
-    return car(cdr(cdr(p)));
-}
-
-/**
- * Returns the cdr of a cdr of a list.
- */
-template<typename T> const list<T> cddr(const list<T>& p) {
-    return cdr(cdr(p));
-}
-
-/**
- * Returns the cdr of a cdr of the cdr of a list.
- */
-template<typename T> const list<T> cdddr(const list<T>& p) {
-    return cdr(cdr(cdr(p)));
-}
-
-/**
- * Returns the length of a list.
- */
-template<typename T> struct lengthRef {
-    const int operator()(const int c, const list<T>& p) {
-        if(isNil(p))
-            return c;
-        return (*this)(c + 1, cdr(p));
-    }
-};
-
-template<typename T> const int length(const list<T>& p) {
-    return lengthRef<T> ()(0, p);
-}
-
-/**
- * Appends a list and a lambda function returning a list.
- */
-template<typename T> struct appendCdr {
-    const list<T> a;
-    const lambda<list<T> ()> fb;
-    appendCdr(const list<T>& a, const lambda<list<T> ()>& fb) :
-        a(a), fb(fb) {
-    }
-    const list<T> operator()() const {
-        return append(a, fb);
-    }
-};
-
-template<typename T> const list<T> append(const list<T>&a, const lambda<list<T> ()>& fb) {
-    if(isNil(a))
-        return fb();
-
-    return cons(car(a), lambda<list<T> ()> (appendCdr<T> (cdr(a), fb)));
-}
-
-/**
- * Appends two lists.
- */
-template<typename T> const list<T> append(const list<T>&a, const list<T>& b) {
-    return append(a, unit(b));
-}
-
-/**
- * Map a lambda function on a list.
- */
-template<typename T, typename R> const list<R> map(const lambda<R(T)>& f, const list<T>& p) {
-    if(isNil(p))
-        return list<R> ();
-    return cons(f(car(p)), map(f, cdr(p)));
-}
-
-/**
- * Run a reduce lambda function on a list.
- */
-template<typename T, typename R> struct reduceAccumulate {
-    const lambda<R(R, T)> f;
-    explicit reduceAccumulate(const lambda<R(R, T)>& f) :
-        f(f) {
-    }
-    R operator()(const R& acc, const list<T>& p) const {
-        if(isNil(p))
-            return acc;
-        return (*this)(f(acc, car(p)), cdr(p));
-    }
-};
-
-template<typename T, typename R> const R reduce(const lambda<R(R, T)>& f, const R& initial, const list<T>& p) {
-    return reduceAccumulate<T, R> (f)(initial, p);
-}
-
-/**
- * Run a filter lambda function on a list.
- */
-template<typename T> const list<T> filter(const lambda<bool(T)>& f, const list<T>& p) {
-    if(isNil(p))
-        return list<T> ();
-    if(f(car(p))) {
-        const lambda<list<T> (lambda<bool(T)> , list<T> )> ff(filter<T> );
-        return cons(car(p), curry(ff, f, cdr(p)));
-    }
-    return filter(f, cdr(p));
-}
-
-/**
- * Returns a list pointing to a member of a list.
- */
-template<typename T> const list<T> member(const T& t, const list<T>& p) {
-    if(isNil(p))
-        return list<T> ();
-    if(t == car(p))
-        return p;
-    return member(t, cdr(p));
-}
-
-/**
- * Reverse a list.
- */
-template<typename T> const list<T> reverseIter(const list<T>& acc, const list<T>& p) {
-    if(isNil(p))
-        return acc;
-    return reverseIter(cons(car(p), acc), cdr(p));
-}
-
-template<typename T> const list<T> reverse(const list<T>& p) {
-    return reverseIter(list<T> (), p);
-}
-
-template<typename T> const list<T> seq(const T& start, const T& end);
-
-template<typename T> struct seqGenerate {
-    const T start;
-    const T end;
-    seqGenerate(const T& start, const T&end) :
-        start(start), end(end) {
-    }
-    const list<T> operator()() const {
-        return seq<T> (start, end);
-    }
-};
-
-/**
- * Returns a sequence of values between the given bounds.
- */
-template<typename T> const list<T> seq(const T& start, const T& end) {
-    if(start == end)
-        return makeList(start);
-    if(start < end)
-        return cons(start, lambda<list<T> ()> (seqGenerate<T> (start + 1, end)));
-    return cons(start, lambda<list<T> ()> (seqGenerate<T> (start - 1, end)));
-}
-
-/**
- * Equivalent of the list assoc function.
- */
-template<typename T> const list<T> assoc(const T& k, const list<list<T> >& p) {
-    if(isNil(p))
-        return list<T> ();
-    if(k == car(car(p)))
-        return car(p);
-    return assoc(k, cdr(p));
-}
-
-/**
- * Pretty print a list.
- */
-template<typename T> std::ostream& print(const list<T>& l, std::ostream& os) {
-    os << "(";
-    if (!isNil(l)) {
-        list<T> ml = l;
-        while(true) {
-            os << car(ml);
-            ml = cdr(ml);
-            if (isNil(ml))
-                break;
-            os << ", ";
-        }
-    }
-    os << ")";
-    return os;
-}
-
-}
-
-#endif /* tuscany_list_hpp */
diff --git a/cpp/sca/runtime/core/src/tuscany/parallel.hpp b/cpp/sca/runtime/core/src/tuscany/parallel.hpp
deleted file mode 100644
index c0d578e281..0000000000
--- a/cpp/sca/runtime/core/src/tuscany/parallel.hpp
+++ /dev/null
@@ -1,283 +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.
- */
-
-/* $Rev$ $Date$ */
-
-#ifndef tuscany_parallel_hpp
-#define tuscany_parallel_hpp
-
-/**
- * Simple parallel work execution functions.
- */
-
-#include <pthread.h>
-#include <sys/syscall.h>
-#include "function.hpp"
-
-namespace tuscany {
-
-/**
- * Returns the current thread id.
- */
-unsigned int threadId() {
-    return syscall(__NR_gettid);
-}
-
-/**
- * Represents a value which will be know in the future.
- */
-template<typename T> class future {
-
-private:
-    template<typename X> class futureValue {
-    public:
-        futureValue() :
-            refCount(0), hasValue(false) {
-            pthread_mutex_init(&valueMutex, NULL);
-            pthread_cond_init(&valueCond, NULL);
-        }
-
-        ~futureValue() {
-            pthread_mutex_destroy(&valueMutex);
-            pthread_cond_destroy(&valueCond);
-        }
-
-        unsigned int acquire() {
-            return __sync_add_and_fetch(&refCount, 1);
-        }
-
-        unsigned int release() {
-            return __sync_sub_and_fetch(&refCount, 1);
-        }
-
-        bool set(const T& v) {
-            pthread_mutex_lock(&valueMutex);
-            if(hasValue) {
-                pthread_mutex_unlock(&valueMutex);
-                return false;
-            }
-            hasValue = true;
-            value = v;
-            pthread_mutex_unlock(&valueMutex);
-            pthread_cond_broadcast(&valueCond);
-            return true;
-        }
-
-        const T get() {
-            pthread_mutex_lock(&valueMutex);
-            while(!hasValue) {
-                pthread_cond_wait(&valueCond, &valueMutex);
-            }
-            const T& v = value;
-            pthread_mutex_unlock(&valueMutex);
-            return v;
-        }
-
-    private:
-        unsigned refCount;
-        pthread_mutex_t valueMutex;
-        pthread_cond_t valueCond;
-        bool hasValue;
-        X value;
-    };
-
-    gc_counting_ptr<futureValue<T> > fvalue;
-
-    template<typename X> friend const X get(const future<X>& f);
-    template<typename X> friend bool set(const future<X>& f, const X& v);
-
-public:
-    future() : fvalue(new futureValue<T>()) {
-        //std::cout << "future() threadId " << threadId() << "\n";
-    }
-
-    ~future() {
-        //std::cout << "~future() threadId " << threadId() << "\n";
-    }
-
-    future(const future& f) : fvalue(f.fvalue) {
-        //std::cout << "future(const future& f) threadId " << threadId() << "\n";
-    }
-
-    const future& operator=(const future& f) {
-        //std::cout << "future::operator=(const future& f) threadId " << threadId() << "\n";
-        if (&f == this)
-            return *this;
-        fvalue = f.fvalue;
-        return *this;
-    }
-
-    const future& operator=(const T& v) const {
-        fvalue->set(v);
-        return *this;
-    }
-
-    operator const T() const {
-        return fvalue->get();
-    }
-
-};
-
-/**
- * A bounded thread safe queue.
- */
-template<typename T> class queue {
-public:
-    explicit queue(int max) : max(max), size(0), tail(0), head(0), values(new T[max]) {
-        pthread_mutex_init(&mutex, NULL);
-        pthread_cond_init(&full, NULL);
-        pthread_cond_init(&empty, NULL);
-    }
-
-    ~queue() {
-        pthread_mutex_destroy(&mutex);
-        pthread_cond_destroy(&full);
-        pthread_cond_destroy(&empty);
-    }
-
-private:
-    const int max;
-    int size;
-    int tail;
-    int head;
-    pthread_mutex_t mutex;
-    pthread_cond_t full;
-    pthread_cond_t empty;
-    gc_aptr<T> values;
-
-    template<typename X> friend const int enqueue(queue<X>& q, const X& v);
-    template<typename X> friend const X dequeue(queue<X>& q);
-};
-
-/**
- * Adds an element to the tail of the queue.
- */
-template<typename T> const int enqueue(queue<T>&q, const T& v) {
-    pthread_mutex_lock(&q.mutex);
-    while(q.size == q.max)
-        pthread_cond_wait(&q.full, &q.mutex);
-    q.values[q.tail] = v;
-    q.tail = (q.tail + 1) % q.max;
-    q.size++;
-    pthread_mutex_unlock(&q.mutex);
-    pthread_cond_broadcast(&q.empty);
-    return q.size;
-}
-
-/**
- * Returns the element at the head of the queue.
- */
-template<typename T> const T dequeue(queue<T>& q) {
-    pthread_mutex_lock(&q.mutex);
-    while(q.size == 0)
-        pthread_cond_wait(&q.empty, &q.mutex);
-    const T v = q.values[q.head];
-    q.head = (q.head + 1) % q.max;
-    q.size--;
-    pthread_mutex_unlock(&q.mutex);
-    pthread_cond_broadcast(&q.full);
-    return v;
-}
-
-/**
- * The worker thread function.
- */
-void *workerThreadFunc(void *arg) {
-    queue<lambda<bool()> >* work = reinterpret_cast<queue<lambda<bool()> >*>(arg);
-    while(dequeue(*work)())
-        ;
-    return NULL;
-}
-
-/**
- * Returns a list of worker threads.
- */
-const list<pthread_t> makeWorkerThreads(queue<lambda<bool()> >& queue, const int count) {
-    if (count == 0)
-        return list<pthread_t>();
-    pthread_t thread;
-    pthread_create(&thread, NULL, workerThreadFunc, &queue);
-    return cons(thread, makeWorkerThreads(queue, count - 1));
-}
-
-/**
- * A worker, implemented with a work queue and a pool of threads.
- */
-class worker {
-public:
-    explicit worker(int max) : work(queue<lambda<bool()> >(max)), threads(makeWorkerThreads(work, max)) {
-    }
-
-private:
-    queue<lambda<bool()> > work;
-    const list<pthread_t> threads;
-
-    template<typename X> friend const future<X> submit(worker& w, const lambda<X()>& func);
-    friend const bool shutdown(worker& w);
-};
-
-/**
- * Function used to wrap work submitted to a worker.
- */
-template<typename R> bool submitFunc(const lambda<R()>& func, const future<R>& fut) {
-    fut = func();
-    return true;
-}
-
-/**
- * Submits work to a worker.
- */
-template<typename R> const future<R> submit(worker& w, const lambda<R()>& func) {
-    const future<R> fut;
-    const lambda<bool()> f = curry(lambda<bool(lambda<R()>, future<R>)>(submitFunc<R>), func, fut);
-    enqueue(w.work, f);
-    return fut;
-}
-
-/**
- * Enqueues shutdown requests.
- */
-const bool shutdownEnqueue(const list<pthread_t>& threads, queue<lambda<bool()> >& work) {
-    if (threads == list<pthread_t>())
-        return true;
-    enqueue(work, unit(false));
-    return shutdownEnqueue(cdr(threads), work);
-}
-
-/**
- * Waits for shut down threads to terminate.
- */
-const bool shutdownJoin(const list<pthread_t>& threads) {
-    if (threads == list<pthread_t>())
-        return true;
-    pthread_join(car(threads), NULL);
-    return shutdownJoin(cdr(threads));
-}
-
-/**
- * Shutdown a worker.
- */
-const bool shutdown(worker& w) {
-    shutdownEnqueue(w.threads, w.work);
-    shutdownJoin(w.threads);
-    return true;
-}
-
-}
-#endif /* tuscany_parallel_hpp */
diff --git a/cpp/sca/runtime/core/src/tuscany/value.hpp b/cpp/sca/runtime/core/src/tuscany/value.hpp
deleted file mode 100644
index ca4bd06ca6..0000000000
--- a/cpp/sca/runtime/core/src/tuscany/value.hpp
+++ /dev/null
@@ -1,357 +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.
- */
-
-/* $Rev$ $Date$ */
-
-#ifndef tuscany_value_hpp
-#define tuscany_value_hpp
-
-/**
- * Generic value type.
- */
-
-#include <string>
-#include <iostream>
-#include "gc.hpp"
-#include "function.hpp"
-#include "list.hpp"
-
-namespace tuscany
-{
-
-long int countValues = 0;
-long int countEValues = 0;
-long int countCValues = 0;
-long int countVValues = 0;
-
-bool resetValueCounters() {
-    countValues = countEValues = countCValues = countVValues = 0;
-    return true;
-}
-
-bool printValueCounters() {
-    std::cout << "countValues " << countValues << std::endl;
-    std::cout << "countEValues " << countEValues << std::endl;
-    std::cout << "countCValues " << countCValues << std::endl;
-    std::cout << "countVValues " << countVValues << std::endl;
-    return true;
-}
-
-class value;
-
-class value {
-public:
-
-    enum ValueType {
-        Undefined, Symbol, String, List, Number, Boolean, Character, Lambda
-    };
-
-    value() :
-        type(value::Undefined) {
-        countValues++;
-        countEValues++;
-    }
-
-    value(const value& v) {
-        countValues++;
-        countCValues++;
-        type = v.type;
-        switch(type) {
-        case value::List:
-            lst() = v.lst();
-        case value::Lambda:
-            func() = v.func();
-        case value::Symbol:
-            str() = v.str();
-        case value::String:
-            str() = v.str();
-        case value::Number:
-            num() = v.num();
-        case value::Boolean:
-            boo() = v.boo();
-        case value::Character:
-            chr() = v.chr();
-        default:
-            break;
-        }
-    }
-
-    const value& operator=(const value& v) {
-        if(this == &v)
-            return *this;
-        type = v.type;
-        switch(type) {
-        case value::List:
-            lst() = v.lst();
-        case value::Lambda:
-            func() = v.func();
-        case value::Symbol:
-            str() = v.str();
-        case value::String:
-            str() = v.str();
-        case value::Number:
-            num() = v.num();
-        case value::Boolean:
-            boo() = v.boo();
-        case value::Character:
-            chr() = v.chr();
-        default:
-            break;
-        }
-        return *this;
-    }
-
-    virtual ~value() {
-        countValues--;
-    }
-
-    explicit value(const lambda<value(list<value>&)>& func) :
-        type(value::Lambda), data(vdata(func)) {
-        countValues++;
-        countVValues++;
-    }
-
-    explicit value(const std::string& str) :
-        type(value::String), data(vdata(unit(str))) {
-        countValues++;
-        countVValues++;
-    }
-
-    explicit value(const char* str) :
-        type(value::Symbol), data(vdata(unit(std::string(str)))) {
-        countValues++;
-        countVValues++;
-    }
-
-    explicit value(const list<value>& lst) :
-        type(value::List), data(vdata(unit(lst))) {
-        countValues++;
-        countVValues++;
-    }
-
-    explicit value(const double num) :
-        type(value::Number), data(vdata(unit(num))) {
-        countValues++;
-        countVValues++;
-    }
-
-    explicit value(const int num) :
-        type(value::Number), data(vdata(unit((double)num))) {
-        countValues++;
-        countVValues++;
-    }
-
-    explicit value(const bool boo) :
-        type(value::Boolean), data(vdata(unit(boo))) {
-        countValues++;
-        countVValues++;
-    }
-
-    explicit value(const char chr) :
-        type(value::Character), data(vdata(unit(chr))) {
-        countValues++;
-        countVValues++;
-    }
-
-    const bool operator!=(const value& v) const {
-        return !this->operator==(v);
-    }
-
-    const bool operator==(const value& v) const {
-        if(this == &v)
-            return true;
-        if(type != v.type)
-            return false;
-        switch(type) {
-        case value::Undefined:
-            return true;
-        case value::List:
-            return lst()() == v.lst()();
-        case value::Lambda:
-            return func() == v.func();
-        case value::Symbol:
-            return str()() == v.str()();
-        case value::String:
-            return str()() == v.str()();
-        case value::Number:
-            return num()() == v.num()();
-        case value::Boolean:
-            return boo()() == v.boo()();
-        case value::Character:
-            return chr()() == v.chr()();
-        default:
-            return false;
-        }
-    }
-
-    const value operator()(list<value>& args) const {
-        return func()(args);
-    }
-
-    operator const std::string() const {
-        return str()();
-    }
-
-    operator const double() const {
-        return num()();
-    }
-
-    operator const int() const {
-        return num()();
-    }
-
-    operator const bool() const {
-        return boo()();
-    }
-
-    operator const char() const {
-        return chr()();
-    }
-
-    operator const list<value>() const {
-        return lst()();
-    }
-
-    operator const lambda<value(list<value>&)>() const {
-        return func();
-    }
-
-    friend std::ostream& operator<<(std::ostream&, const value&);
-
-    ValueType type;
-    lambda<char()> data;
-
-private:
-    template<typename T> lambda<T>& vdata() const {
-        return *reinterpret_cast<lambda<T> *> (const_cast<lambda<char()> *> (&data));
-    }
-
-    template<typename T> const lambda<char()>& vdata(const T& v) const {
-        return *reinterpret_cast<const lambda<char()> *> (&v);
-    }
-
-    lambda<double()>& num() const {
-        return vdata<double()> ();
-    }
-
-    lambda<bool()>& boo() const {
-        return vdata<bool()> ();
-    }
-
-    lambda<char()>& chr() const {
-        return vdata<char()> ();
-    }
-
-    lambda<std::string()>& str() const {
-        return vdata<std::string()> ();
-    }
-
-    lambda<list<value>()>& lst() const {
-        return vdata<list<value>()> ();
-    }
-
-    lambda<value(list<value>&)>& func() const {
-        return vdata<value(list<value>&)> ();
-    }
-
-};
-
-std::ostream& operator<<(std::ostream& out, const value& v) {
-    switch(v.type) {
-    case value::List:
-        return out << "List::" << v.lst()();
-    case value::Lambda:
-        return out << "Lambda::" << v.func();
-    case value::Symbol:
-        return out << "Symbol::" << v.str()();
-    case value::String:
-        return out << "String::" << '\'' << v.str()() << '\'';
-    case value::Number:
-        return out << "Number::" << v.num()();
-    case value::Boolean:
-        if(v.boo()())
-            return out << "Boolean::" << "true";
-        else
-            return out << "Boolean::" << "false";
-    case value::Character:
-        return out << "Character::" << v.chr()();
-    default:
-        return out << "Undefined";
-    }
-}
-
-const bool isNil(const value& value) {
-    return value.type == value::Undefined;
-}
-
-const bool isString(const value& value) {
-    return value.type == value::String;
-}
-
-const bool isSymbol(const value& value) {
-    return value.type == value::Symbol;
-}
-
-const bool isList(const value& value) {
-    return value.type == value::List;
-}
-
-const bool isNumber(const value& value) {
-    return value.type == value::Number;
-}
-
-const bool isBoolean(const value& value) {
-    return value.type == value::Boolean;
-}
-
-const bool isCharacter(const value& value) {
-    return value.type == value::Character;
-}
-
-const bool isTaggedList(const value& exp, value tag) {
-    if(isList(exp))
-        return car((list<value> )exp) == tag;
-    return false;
-}
-
-/**
- * Pretty print a list of values.
- */
-std::ostream& print(const list<value>& l, std::ostream& os) {
-    os << "(";
-    if (!isNil(l)) {
-        list<value> ml = l;
-        while(true) {
-            const value v = car(ml);
-            if (isList(v))
-                print(list<value>(v), os);
-            else
-                os << v;
-            ml = cdr(ml);
-            if (isNil(ml))
-                break;
-            os << ", ";
-        }
-    }
-    os << ")";
-    return os;
-}
-
-}
-#endif /* tuscany_value_hpp */
diff --git a/cpp/sca/runtime/core/src/tuscany/xml.hpp b/cpp/sca/runtime/core/src/tuscany/xml.hpp
deleted file mode 100644
index b4a3b87ad1..0000000000
--- a/cpp/sca/runtime/core/src/tuscany/xml.hpp
+++ /dev/null
@@ -1,385 +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.
- */
-
-/* $Rev$ $Date$ */
-
-#ifndef tuscany_xml_hpp
-#define tuscany_xml_hpp
-
-/**
- * XML read/write functions.
- */
-
-#include <libxml/xmlreader.h>
-#include <libxml/xmlwriter.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/globals.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include "list.hpp"
-
-namespace tuscany {
-
-/**
- * Encapsulates a libxml2 xmlTextReader and its state.
- */
-class XmlReader {
-public:
-    enum TokenType {
-        None = 0, Element = 1, Attribute = 2, EndElement = 15, Identifier = 100, Text = 101, End = 103
-    };
-
-    explicit XmlReader(xmlTextReaderPtr xml) : xml(xml), tokenType(None) {
-        xmlTextReaderSetParserProp(xml, XML_PARSER_DEFAULTATTRS, 1);
-        xmlTextReaderSetParserProp(xml, XML_PARSER_SUBST_ENTITIES, 1);
-    }
-
-    ~XmlReader() {
-        xmlFreeTextReader(xml);
-    }
-
-    /**
-     * Read the next token and return its type.
-     */
-    int read() {
-        if (tokenType == End)
-            return tokenType;
-        if (tokenType == Element) {
-            isEmptyElement = xmlTextReaderIsEmptyElement(xml);
-            hasValue = xmlTextReaderHasValue(xml);
-            hasAttributes = xmlTextReaderHasAttributes(xml);
-            return tokenType = Identifier;
-        }
-        if (hasValue && tokenType == Identifier)
-            return tokenType = Text;
-        if (hasAttributes && (tokenType == Identifier || tokenType == Text) && xmlTextReaderMoveToFirstAttribute(xml) == 1)
-            return tokenType = Attribute;
-        if (tokenType == Attribute && xmlTextReaderMoveToNextAttribute(xml) == 1)
-            return tokenType = Attribute;
-        if (isEmptyElement && (tokenType == Identifier || tokenType == Text || tokenType == Attribute))
-            return tokenType = EndElement;
-        if (!xmlTextReaderRead(xml))
-            return tokenType = End;
-        return tokenType = xmlTextReaderNodeType(xml);
-    }
-
-    operator xmlTextReaderPtr() const {
-        return xml;
-    }
-
-private:
-    const xmlTextReaderPtr xml;
-    int tokenType;
-    bool isEmptyElement;
-    bool hasValue;
-    bool hasAttributes;
-};
-
-/**
- * Constants used to tag XML tokens.
- */
-const value endElement("<");
-const value startElement(">");
-const value attribute("attribute");
-const value element("element");
-
-/**
- * Read an XML identifier.
- */
-const value readIdentifier(XmlReader& reader) {
-    const char* name = (const char*)xmlTextReaderConstName(reader);
-    return value(name);
-}
-
-/**
- * Read XML text.
- */
-const value readText(XmlReader& reader) {
-    const char *val = (const char*)xmlTextReaderConstValue(reader);
-    return value(std::string(val));
-}
-
-/**
- * Read an XML attribute.
- */
-const value readAttribute(XmlReader& reader) {
-    const char *name = (const char*)xmlTextReaderConstName(reader);
-    const char *val = (const char*)xmlTextReaderConstValue(reader);
-    return value(makeList(attribute, value(name), value(std::string(val))));
-}
-
-/**
- * Read an XML token.
- */
-const value readToken(XmlReader& reader) {
-    const int tokenType = reader.read();
-    if (tokenType == XmlReader::End)
-        return value();
-    if (tokenType == XmlReader::Element)
-        return startElement;
-    if (tokenType == XmlReader::Identifier)
-        return readIdentifier(reader);
-    if (tokenType == XmlReader::Attribute)
-        return readAttribute(reader);
-    if (tokenType == XmlReader::Text)
-        return readText(reader);
-    if (tokenType == XmlReader::EndElement)
-        return endElement;
-    return readToken(reader);
-}
-
-/**
- * Read a list of XML tokens.
- */
-const list<value> readList(const list<value>& listSoFar, XmlReader& reader) {
-    const value token = readToken(reader);
-    if(isNil(token) || endElement == token)
-        return reverse(listSoFar);
-    if(startElement == token)
-        return readList(cons(value(readList(makeList(element), reader)), listSoFar), reader);
-    return readList(cons(token, listSoFar), reader);
-}
-
-/**
- * Read an XML document from a libxml2 XML reader.
- */
-const list<value> read(XmlReader& reader) {
-    value nextToken = readToken(reader);
-    if (startElement == nextToken)
-        return makeList(value(readList(makeList(element), reader)));
-    return list<value>();
-}
-
-/**
- * Callback function called by libxml2 to read the XML input stream.
- */
-int readCallback(void *context, char* buffer, int len) {
-    std::istream* is = static_cast<std::istream*>(context);
-    is->read(buffer, len);
-    if (!is->eof() && (is->fail() || is->bad()))
-        return -1;
-    const int n = is->gcount();
-    return n;
-}
-
-/**
- * Read an XML document from an input stream.
- */
-const list<value> readXML(std::istream& is) {
-    xmlTextReaderPtr xml = xmlReaderForIO(readCallback, NULL, &is, NULL, NULL, XML_PARSE_NONET);
-    if (xml == NULL)
-        return list<value>();
-    XmlReader reader(xml);
-    return read(reader);
-}
-
-/**
- * Callback function called by libxml2 to read the XML file input stream.
- */
-int readFileCallback(void *context, char* buffer, int len) {
-    std::ifstream* is = static_cast<std::ifstream*>(context);
-    is->read(buffer, len);
-    if (is->fail() || is->bad())
-        return -1;
-    return is->gcount();
-}
-
-/**
- * Callback function called by libxml2 to close the XML file input stream.
- */
-int readCloseFileCallback(void *context) {
-    std::ifstream* fis = static_cast<std::ifstream*>(context);
-    fis->close();
-    return 0;
-}
-
-/**
- * Read an XML document from a file input stream.
- */
-const list<value> readXML(std::ifstream& is) {
-    xmlTextReaderPtr xml = xmlReaderForIO(readFileCallback, readCloseFileCallback, &is, NULL, NULL, XML_PARSE_NONET);
-    if (xml == NULL)
-        return list<value>();
-    XmlReader reader(xml);
-    return read(reader);
-}
-
-/**
- * Returns true if a value is an XML attribute.
- */
-const bool isAttribute(const list<value>& l) {
-    return !isNil(l) && car(l) == attribute;
-}
-
-/**
- * Returns the name of an XML attribute.
- */
-const std::string attributeName(const list<value>& l) {
-    return cadr(l);
-}
-
-/**
- * Returns the text value of an XML attribute.
- */
-const std::string attributeText(const list<value>& l) {
-    return caddr(l);
-}
-
-/**
- * Returns true if a value is an XML element.
- */
-const bool isElement(const list<value>& l) {
-    return !isNil(l) && car(l) == element;
-}
-
-/**
- * Returns the name of an XML element.
- */
-const std::string elementName(const list<value>& l) {
-    return cadr(l);
-}
-
-/**
- * Returns true if an XML element contains text content.
- */
-const bool elementHasText(const list<value>& l) {
-    if (isNil(cddr(l)))
-        return false;
-    return isString(caddr(l));
-}
-
-/**
- * Returns the text content of an XML element.
- */
-const std::string elementText(const list<value>& l) {
-    return caddr(l);
-}
-
-/**
- * Returns the children of an XML element.
- */
-const list<value> elementChildren(const list<value>& l) {
-    return cddr(l);
-}
-
-/**
- * Default encoding used to write XML documents.
- */
-const char* encoding = "UTF-8";
-
-/**
- * Write a list of XML element or attribute tokens.
- */
-const bool writeList(const list<value>& l, const xmlTextWriterPtr xml) {
-    if (isNil(l))
-        return true;
-
-    // Write an attribute
-    const list<value> token(car(l));
-    if (isAttribute(token)) {
-        if (xmlTextWriterWriteAttribute(xml, (const xmlChar*)attributeName(token).c_str(), (const xmlChar*)attributeText(token).c_str()) < 0)
-            return false;
-
-    } else if (isElement(token)) {
-
-        // Write an element
-        if (xmlTextWriterStartElement(xml, (const xmlChar*)elementName(token).c_str()) < 0)
-            return false;
-        if (elementHasText(token) && xmlTextWriterWriteString(xml, (const xmlChar*)elementText(token).c_str()) < 0)
-            return false;
-
-        // Write its children
-        writeList(elementChildren(token), xml);
-
-        if (xmlTextWriterEndElement(xml) < 0)
-            return false;
-    }
-
-    // Go on
-    return writeList(cdr(l), xml);
-}
-
-/**
- * Write an XML document to a libxml2 XML writer.
- */
-const bool write(const list<value>& l, const xmlTextWriterPtr xml) {
-    if (xmlTextWriterStartDocument(xml, NULL, encoding, NULL) < 0)
-        return false;
-    writeList(l, xml);
-    if (xmlTextWriterEndDocument(xml) < 0)
-        return false;
-    return true;
-}
-
-/**
- * Callback function called by libxml2 to write to the XML output stream.
- */
-int writeCallback(void *context, const char* buffer, int len) {
-    std::ostream* os = static_cast<std::ostream*>(context);
-    os->write(buffer, len);
-    if (os->fail() || os->bad())
-        return -1;
-    return len;
-}
-
-/**
- * Write an XML document to an output stream.
- */
-const bool writeXML(const list<value>& l, std::ostream& os) {
-    xmlOutputBufferPtr out = xmlOutputBufferCreateIO(writeCallback, NULL, &os, NULL);
-    xmlTextWriterPtr xml = xmlNewTextWriter(out);
-    if (xml == NULL)
-        return false;
-    return write(l, xml);
-}
-
-/**
- * Callback function called by libxml2 to write to the XML file output stream.
- */
-int writeFileCallback(void *context, const char* buffer, int len) {
-    std::ofstream* os = static_cast<std::ofstream*>(context);
-    os->write(buffer, len);
-    if (os->fail() || os->bad())
-        return -1;
-    return len;
-}
-
-/**
- * Callback function called by libxml2 to close the XML file output stream.
- */
-int writeCloseFileCallback(void *context) {
-    std::ofstream* fos = static_cast<std::ofstream*>(context);
-    fos->close();
-    return 0;
-}
-
-/**
- * Write an XML document to a file output stream.
- */
-const bool writeXML(const list<value>& l, std::ofstream& os) {
-    xmlOutputBufferPtr out = xmlOutputBufferCreateIO(writeFileCallback, writeCloseFileCallback, &os, NULL);
-    xmlTextWriterPtr xml = xmlNewTextWriter(out);
-    if (xml == NULL)
-        return false;
-    return write(l, xml);
-}
-
-}
-#endif /* tuscany_xml_hpp */
diff --git a/cpp/sca/runtime/core/test/Makefile.am b/cpp/sca/runtime/core/test/Makefile.am
index 55fe571687..de5c2d1b1e 100644
--- a/cpp/sca/runtime/core/test/Makefile.am
+++ b/cpp/sca/runtime/core/test/Makefile.am
@@ -15,13 +15,3 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = core-test xml-test
-
-INCLUDES = -I. -I$(top_builddir)/runtime/core/src -I${LIBXML2_INCLUDE}
-
-core_test_SOURCES = tuscany/core-test.cpp
-core_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca
-
-xml_test_SOURCES = tuscany/xml-test.cpp
-xml_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca
-
diff --git a/cpp/sca/runtime/core/test/tuscany/core-test.cpp b/cpp/sca/runtime/core/test/tuscany/core-test.cpp
deleted file mode 100644
index a0b32fa576..0000000000
--- a/cpp/sca/runtime/core/test/tuscany/core-test.cpp
+++ /dev/null
@@ -1,444 +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.
- */
-
-/* $Rev$ $Date$ */
-
-/**
- * Test core utils.
- */
-
-#include <assert.h>
-#include <sys/time.h>
-#include <time.h>
-#include <iostream>
-#include <string>
-#include <sstream>
-#include "tuscany/function.hpp"
-#include "tuscany/list.hpp"
-#include "tuscany/parallel.hpp"
-#include "tuscany/value.hpp"
-#include "tuscany/xml.hpp"
-
-namespace tuscany {
-
-struct inc {
-    int i;
-    inc(int i) :
-        i(i) {
-    }
-    const int operator()(const int x) const {
-        return x + i;
-    }
-};
-
-const int square(const int x) {
-    return x * x;
-}
-
-bool testFunction() {
-    const lambda<int(int)> sq(square);
-    assert(sq(2) == 4);
-
-    const lambda<int(int i)> incf(inc(10));
-    assert(incf(1) == 11);
-    return true;
-}
-
-bool testFunctionGC() {
-    resetLambdaCounters();
-    testFunction();
-    assert(countLambdas == 0);
-    return true;
-}
-
-int countElements = 0;
-
-struct Element {
-    int i;
-
-    Element() :
-        i(0) {
-        countElements++;
-    }
-
-    Element(int i) :
-        i(i) {
-        countElements++;
-    }
-
-    Element(const Element& o) :
-        i(o.i) {
-        countElements++;
-    }
-
-    ~Element() {
-        countElements--;
-    }
-
-    const bool operator==(const Element& o) const {
-        return o.i == i;
-    }
-};
-
-bool testCons() {
-    assert(car(cons(2, makeList(3))) == 2);
-    assert(car(cdr(cons(2, makeList(3)))) == 3);
-    assert(isNil(cdr(cdr(cons(2, makeList(3))))));
-
-    assert(cons(Element(1), makeList(Element(2))) == makeList(Element(1), Element(2)));
-    return true;
-}
-
-bool testlistGC() {
-    resetLambdaCounters();
-    resetlistCounters();
-    countElements = 0;
-    testCons();
-    assert(countLambdas == 0);
-    assert(countlists == 0);
-    assert(countElements == 0);
-    return true;
-}
-
-bool testOut() {
-    std::ostringstream os1;
-    os1 << list<int> ();
-    assert(os1.str() == "()");
-
-    std::ostringstream os2;
-    os2 << makeList(1, 2, 3);
-    assert(os2.str() == "(1, (2, (3, ())))");
-    return true;
-}
-
-bool testEquals() {
-    assert(list<int>() == list<int>());
-    assert(makeList(1, 2) == makeList(1, 2));
-    assert(list<int>() != makeList(1, 2));
-    assert(makeList(1, 2, 3) == makeList(1, 2, 3));
-    assert(makeList(1, 2) != makeList(1, 2, 3));
-    return true;
-}
-
-bool testLength() {
-    assert(0 == length(list<int>()));
-    assert(1 == length(makeList(1)));
-    assert(2 == length(cons(1, makeList(2))));
-    return true;
-}
-
-bool testAppend() {
-    assert(car(append(makeList(1), makeList(2))) == 1);
-    assert(car(cdr(append(makeList(1), makeList(2)))) == 2);
-    assert(car(cdr(cdr(append(makeList(1), makeList(2, 3))))) == 3);
-    assert(isNil(cdr(cdr(cdr(append(makeList(1), makeList(2, 3)))))));
-    return true;
-}
-
-struct Complex {
-    int x;
-    int y;
-    Complex() {
-    }
-    Complex(int x, int y) :
-        x(x), y(y) {
-    }
-};
-
-bool testComplex() {
-    const list<Complex> p = makeList(Complex(1, 2), Complex(3, 4));
-    assert(car(p).x == 1);
-    assert(car(cdr(p)).x == 3);
-    assert(isNil(cdr(cdr(p))));
-    return true;
-}
-
-bool testMap() {
-    assert(isNil(map((lambda<int(int)>)square, list<int>())));
-
-    const list<int> m = map((lambda<int(int)> )square, makeList(2, 3));
-    assert(car(m) == 4);
-    assert(car(cdr(m)) == 9);
-
-    return true;
-}
-
-const int add(const int x, const int y) {
-    return x + y;
-}
-
-bool testReduce() {
-    const lambda<int(int, int)> r(add);
-    assert(reduce(r, 0, makeList(1, 2, 3)) == 6);
-    return true;
-}
-
-bool isPositive(int x) {
-    if(x >= 0)
-        return true;
-    else
-        return false;
-}
-
-bool testFilter() {
-    lambda<bool(int)> f(isPositive);
-    assert(car(filter(f, makeList(1, -1, 2, -2))) == 1);
-    assert(cadr(filter(f, makeList(1, -1, 2, -2))) == 2);
-    return true;
-}
-
-bool testMember() {
-    assert(isNil(member(4, makeList(1, 2, 3))));
-    assert(car(member(1, makeList(1, 2, 3))) == 1);
-    assert(car(member(2, makeList(1, 2, 3))) == 2);
-    assert(car(member(3, makeList(1, 2, 3))) == 3);
-    return true;
-}
-
-bool testReverse() {
-    assert(isNil(reverse(list<int>())));
-    assert(car(reverse(makeList(1, 2, 3))) == 3);
-    assert(cadr(reverse(makeList(1, 2, 3))) == 2);
-    return true;
-}
-
-double testSeqMap(double x) {
-    return x;
-}
-
-double testSeqReduce(double v, double accum) {
-    return accum + 1.0;
-}
-
-bool testSeq() {
-    //resetLambdaCounters();
-    //resetlistCounters();
-
-    list<double> s = seq(0.0, 1000.0);
-    assert(1001 == length(s));
-    //printLambdaCounters();
-    //printlistCounters();
-
-    assert(1001 == length(map(lambda<double(double)>(testSeqMap), s)));
-
-    assert(801 == length(member(200.0, s)));
-    assert(201 == length(member(200.0, reverse(s))));
-
-    assert(1001 == reduce(lambda<double(double, double)>(testSeqReduce), 0.0, s));
-    //printLambdaCounters();
-    //printlistCounters();
-
-    return true;
-}
-
-value valueSquare(list<value> x) {
-    return value((int)car(x) * (int)car(x));
-}
-
-bool testValue() {
-    assert(value(true) == value(true));
-    assert(value(1) == value(1));
-    assert(value("abcd") == value("abcd"));
-    lambda<value(list<value>&)> vl(valueSquare);
-    assert(value(vl) == value(vl));
-    assert(value(makeList(value(1), value(2))) == value(makeList(value(1), value(2))));
-    return true;
-}
-
-bool testValueGC() {
-    resetValueCounters();
-    resetLambdaCounters();
-    resetlistCounters();
-    testValue();
-    assert(countValues == 0);
-    assert(countLambdas == 0);
-    assert(countlists == 0);
-    return true;
-}
-
-double fib_aux(double n, double a, double b) {
-    if(n == 0.0)
-        return a;
-    return fib_aux(n - 1.0, b, a + b);
-}
-
-double fib(double n) {
-    return fib_aux(n, 0.0, 1.0);
-}
-
-bool testCppPerf() {
-    struct timeval start;
-    struct timeval end;
-    gettimeofday(&start, NULL);
-
-    list<double> s = seq(0.0, 999.0);
-    list<double> r = map((lambda<double(double)> )fib, s);
-    assert(1000 == length(r));
-
-    gettimeofday(&end, NULL);
-    long t = (end.tv_sec * 1000 + end.tv_usec / 1000) - (start.tv_sec * 1000 + start.tv_usec / 1000);
-    //std::cout << "Fib cpp perf test " << t << " ms" << std::endl;
-    return true;
-}
-
-bool testAtomicPerf() {
-    struct timeval start;
-    struct timeval end;
-    {
-        gettimeofday(&start, NULL);
-        for(int i = 0; i < 10000000;)
-            i = i + 1;
-        gettimeofday(&end, NULL);
-        long t = (end.tv_sec * 1000 + end.tv_usec / 1000) - (start.tv_sec * 1000 + start.tv_usec / 1000);
-        //std::cout << "Loop test " << t << " ms" << std::endl;
-    }
-    {
-        gettimeofday(&start, NULL);
-        for(int i = 0; i < 10000000;)
-            __sync_add_and_fetch(&i, 1);
-        gettimeofday(&end, NULL);
-        long t = (end.tv_sec * 1000 + end.tv_usec / 1000) - (start.tv_sec * 1000 + start.tv_usec / 1000);
-        //std::cout << "Loop atomic test " << t << " ms" << std::endl;
-    }
-    {
-        pthread_mutex_t mutex;
-        pthread_mutex_init(&mutex, NULL);
-        gettimeofday(&start, NULL);
-        for(int i = 0; i < 10000000;) {
-            pthread_mutex_lock(&mutex);
-            i = i + 1;
-            pthread_mutex_unlock(&mutex);
-        }
-        gettimeofday(&end, NULL);
-        pthread_mutex_destroy(&mutex);
-        long t = (end.tv_sec * 1000 + end.tv_usec / 1000) - (start.tv_sec * 1000 + start.tv_usec / 1000);
-        //std::cout << "Loop mutex test " << t << " ms" << std::endl;
-    }
-    return true;
-}
-
-const int mtsquare(const int x) {
-    //std::cout << "thread " << threadId() << " mtsquare(" << x << ")\n";
-    for(int i = 0; i < 10000000; i++)
-        ;
-    return x * x;
-}
-
-bool testWorker() {
-    worker w(10);
-    {
-        const lambda<int()> func = curry(lambda<int(int)> (mtsquare), 2);
-        assert(submit(w, func) == 4);
-    }
-    {
-        const int max = 10;
-
-        list<future<int> > r;
-        for(int i = 0; i < max; i++) {
-            const lambda<int()> func = curry(lambda<int(int)> (mtsquare), i);
-            r = cons(submit(w, func), r);
-        }
-        for(int i = max - 1; i >= 0; i--) {
-            assert(car(r) == i * i);
-            r = cdr(r);
-        }
-    }
-    shutdown(w);
-    return true;
-}
-
-const std::string currencyXML =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" "
-"xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.1\" "
-"targetNamespace=\"http://services\" "
-"name=\"currency\">"
-"<component name=\"CurrencyConverterWebService\">"
-"<implementation.java class=\"services.CurrencyConverterImpl\"/>"
-"<service name=\"CurrencyConverter\">"
-"<binding.ws/>"
-"</service>"
-"</component>"
-"<component name=\"CurrencyConverterWebService2\">"
-"<implementation.java class=\"services.CurrencyConverterImpl2\"/>"
-"<service name=\"CurrencyConverter2\">"
-"<binding.atom/>"
-"</service>"
-"</component>"
-"</composite>"
-"\n";
-
-const bool isName(const value& token) {
-    return isAttribute(token) && attributeName(token) == "name";
-}
-
-bool testReadXML() {
-    std::istringstream is(currencyXML);
-    const list<value> currency = value(readXML(is));
-
-    const value composite = car(currency);
-    assert(isElement(composite));
-    assert(elementName(composite) == "composite");
-    assert(!elementHasText(composite));
-
-    assert(attributeText(car(filter(lambda<bool(value)>(isName), elementChildren(composite)))) == "currency");
-    return true;
-}
-
-bool testWriteXML() {
-    std::istringstream is(currencyXML);
-    const list<value> currency = value(readXML(is));
-    std::ostringstream os;
-    writeXML(currency, os);
-    assert(os.str() == currencyXML);
-    return true;
-}
-
-}
-
-int main() {
-    std::cout << "Testing..." << std::endl;
-
-    tuscany::testFunction();
-    tuscany::testFunctionGC();
-    tuscany::testCons();
-    tuscany::testlistGC();
-    tuscany::testOut();
-    tuscany::testEquals();
-    tuscany::testLength();
-    tuscany::testAppend();
-    tuscany::testComplex();
-    tuscany::testMap();
-    tuscany::testReduce();
-    tuscany::testFilter();
-    tuscany::testMember();
-    tuscany::testReverse();
-    tuscany::testSeq();
-    tuscany::testValue();
-    tuscany::testValueGC();
-    tuscany::testCppPerf();
-    tuscany::testAtomicPerf();
-    tuscany::testWorker();
-    tuscany::testReadXML();
-    tuscany::testWriteXML();
-
-    std::cout << "OK" << std::endl;
-
-    return 0;
-}
diff --git a/cpp/sca/runtime/core/test/tuscany/xml-test.cpp b/cpp/sca/runtime/core/test/tuscany/xml-test.cpp
deleted file mode 100644
index 818c03ba68..0000000000
--- a/cpp/sca/runtime/core/test/tuscany/xml-test.cpp
+++ /dev/null
@@ -1,107 +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.
- */
-
-/* $Rev$ $Date$ */
-
-/**
- * Test validation of a composite file against an SCDL schema.
- */
-
-#include <iostream>
-#include <string>
-#include <libxml/xmlreader.h>
-#include <libxml/xmlschemas.h>
-
-namespace tuscany {
-
-bool printNode(xmlTextReaderPtr reader) {
-    const xmlChar* name = xmlTextReaderConstName(reader);
-    if(name == NULL)
-        name = (xmlChar *)"<unknown>";
-    const xmlChar* value = xmlTextReaderConstValue(reader);
-    std::cout << xmlTextReaderDepth(reader) << " " << xmlTextReaderNodeType(reader) << " " << name << " "
-            << xmlTextReaderIsEmptyElement(reader) << " " << xmlTextReaderHasValue(reader);
-    if(value == NULL)
-        std::cout << std::endl;
-    else
-        std::cout << value << std::endl;
-    return true;
-}
-
-int xmlRead(void *context, char* buffer, int len) {
-    return fread(buffer, 1, len, (FILE*)context);
-}
-
-int xmlClose(void *context) {
-    fclose((FILE*)context);
-    return 0;
-}
-
-bool readFile(const char*xsdfilename, const char *filename) {
-    std::cout << "Loading schemas...\n";
-    const xmlDocPtr xsddoc = xmlReadFile(xsdfilename, NULL, XML_PARSE_NONET);
-    const xmlSchemaParserCtxtPtr xsdctx = xmlSchemaNewDocParserCtxt(xsddoc);
-    const xmlSchemaPtr xsd = xmlSchemaParse(xsdctx);
-    const xmlSchemaValidCtxtPtr validctx = xmlSchemaNewValidCtxt(xsd);
-
-    std::cout << "Reading file...\n";
-    FILE* file = fopen(filename, "r");
-    if (file != NULL) {
-        const xmlTextReaderPtr reader = xmlReaderForIO(xmlRead, xmlClose, file, filename, NULL, XML_PARSE_NONET);
-        xmlTextReaderSetParserProp(reader, XML_PARSER_DEFAULTATTRS, 1);
-        xmlTextReaderSetParserProp(reader, XML_PARSER_SUBST_ENTITIES, 1);
-
-        if(reader != NULL) {
-            xmlTextReaderSchemaValidateCtxt(reader, validctx, 0);
-
-            int rc;
-            while((rc = xmlTextReaderRead(reader)) == 1) {
-                printNode(reader);
-            }
-            if(xmlTextReaderIsValid(reader) != 1)
-                std::cout << "Could not validate document" << std::endl;
-            xmlFreeTextReader(reader);
-            if(rc != 0)
-                std::cout << "Could not parse document" << std::endl;
-        } else
-            std::cout << "Could not create parser" << std::endl;
-    } else
-        std::cout << "Could not open document" << std::endl;
-
-    xmlSchemaFreeValidCtxt(validctx);
-    xmlSchemaFree(xsd);
-    xmlSchemaFreeParserCtxt(xsdctx);
-
-    return true;
-}
-
-}
-
-int main(int argc, char **argv) {
-    std::cout << "Testing..." << std::endl;
-    if(argc != 3)
-        return 1;
-
-    tuscany::readFile(argv[1], argv[2]);
-
-    xmlCleanupParser();
-
-    std::cout << "OK" << std::endl;
-    return 0;
-}
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
deleted file mode 100644
index e8e8f7625a..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ /dev/null
@@ -1,402 +0,0 @@
-<!-- DTD for XML Schemas: Part 1: Structures
-     Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
-     Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
-<!-- $Id: XMLSchema.dtd,v 1.31 2001/10/24 15:50:16 ht Exp $ -->
-<!-- Note this DTD is NOT normative, or even definitive. -->           <!--d-->
-<!-- prose copy in the structures REC is the definitive version -->    <!--d-->
-<!-- (which shouldn't differ from this one except for this -->         <!--d-->
-<!-- comment and entity expansions, but just in case) -->              <!--d-->
-<!-- With the exception of cases with multiple namespace
-     prefixes for the XML Schema namespace, any XML document which is
-     not valid per this DTD given redefinitions in its internal subset of the
-     'p' and 's' parameter entities below appropriate to its namespace
-     declaration of the XML Schema namespace is almost certainly not
-     a valid schema. -->
-
-<!-- The simpleType element and its constituent parts
-     are defined in XML Schema: Part 2: Datatypes -->
-<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
-
-<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
-                         schema document to establish a different
-                         namespace prefix -->
-<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
-                         also define %s as the suffix for the appropriate
-                         namespace declaration (e.g. :foo) -->
-<!ENTITY % nds 'xmlns%s;'>
-
-<!-- Define all the element names, with optional prefix -->
-<!ENTITY % schema "%p;schema">
-<!ENTITY % complexType "%p;complexType">
-<!ENTITY % complexContent "%p;complexContent">
-<!ENTITY % simpleContent "%p;simpleContent">
-<!ENTITY % extension "%p;extension">
-<!ENTITY % element "%p;element">
-<!ENTITY % unique "%p;unique">
-<!ENTITY % key "%p;key">
-<!ENTITY % keyref "%p;keyref">
-<!ENTITY % selector "%p;selector">
-<!ENTITY % field "%p;field">
-<!ENTITY % group "%p;group">
-<!ENTITY % all "%p;all">
-<!ENTITY % choice "%p;choice">
-<!ENTITY % sequence "%p;sequence">
-<!ENTITY % any "%p;any">
-<!ENTITY % anyAttribute "%p;anyAttribute">
-<!ENTITY % attribute "%p;attribute">
-<!ENTITY % attributeGroup "%p;attributeGroup">
-<!ENTITY % include "%p;include">
-<!ENTITY % import "%p;import">
-<!ENTITY % redefine "%p;redefine">
-<!ENTITY % notation "%p;notation">
-
-<!-- annotation elements -->
-<!ENTITY % annotation "%p;annotation">
-<!ENTITY % appinfo "%p;appinfo">
-<!ENTITY % documentation "%p;documentation">
-
-<!-- Customisation entities for the ATTLIST of each element type.
-     Define one of these if your schema takes advantage of the
-     anyAttribute='##other' in the schema for schemas -->
-
-<!ENTITY % schemaAttrs ''>
-<!ENTITY % complexTypeAttrs ''>
-<!ENTITY % complexContentAttrs ''>
-<!ENTITY % simpleContentAttrs ''>
-<!ENTITY % extensionAttrs ''>
-<!ENTITY % elementAttrs ''>
-<!ENTITY % groupAttrs ''>
-<!ENTITY % allAttrs ''>
-<!ENTITY % choiceAttrs ''>
-<!ENTITY % sequenceAttrs ''>
-<!ENTITY % anyAttrs ''>
-<!ENTITY % anyAttributeAttrs ''>
-<!ENTITY % attributeAttrs ''>
-<!ENTITY % attributeGroupAttrs ''>
-<!ENTITY % uniqueAttrs ''>
-<!ENTITY % keyAttrs ''>
-<!ENTITY % keyrefAttrs ''>
-<!ENTITY % selectorAttrs ''>
-<!ENTITY % fieldAttrs ''>
-<!ENTITY % includeAttrs ''>
-<!ENTITY % importAttrs ''>
-<!ENTITY % redefineAttrs ''>
-<!ENTITY % notationAttrs ''>
-<!ENTITY % annotationAttrs ''>
-<!ENTITY % appinfoAttrs ''>
-<!ENTITY % documentationAttrs ''>
-
-<!ENTITY % complexDerivationSet "CDATA">
-      <!-- #all or space-separated list drawn from derivationChoice -->
-<!ENTITY % blockSet "CDATA">
-      <!-- #all or space-separated list drawn from
-                      derivationChoice + 'substitution' -->
-
-<!ENTITY % mgs '%all; | %choice; | %sequence;'>
-<!ENTITY % cs '%choice; | %sequence;'>
-<!ENTITY % formValues '(qualified|unqualified)'>
-
-
-<!ENTITY % attrDecls    '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
-
-<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
-
-<!-- This is used in part2 -->
-<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
-
-%xs-datatypes;
-
-<!-- the duplication below is to produce an unambiguous content model
-     which allows annotation everywhere -->
-<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
-                    ((%simpleType; | %complexType;
-                      | %element; | %attribute;
-                      | %attributeGroup; | %group;
-                      | %notation; ),
-                     (%annotation;)*)* )>
-<!ATTLIST %schema;
-   targetNamespace      %URIref;               #IMPLIED
-   version              CDATA                  #IMPLIED
-   %nds;                %URIref;               #FIXED 'http://www.w3.org/2001/XMLSchema'
-   xmlns                CDATA                  #IMPLIED
-   finalDefault         %complexDerivationSet; ''
-   blockDefault         %blockSet;             ''
-   id                   ID                     #IMPLIED
-   elementFormDefault   %formValues;           'unqualified'
-   attributeFormDefault %formValues;           'unqualified'
-   xml:lang             CDATA                  #IMPLIED
-   %schemaAttrs;>
-<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
-     because at the Infoset level where schemas operate,
-     xmlns(:prefix) is NOT an attribute! -->
-<!-- The declaration of xmlns is a convenience for schema authors -->
- 
-<!-- The id attribute here and below is for use in external references
-     from non-schemas using simple fragment identifiers.
-     It is NOT used for schema-to-schema reference, internal or
-     external. -->
-
-<!-- a type is a named content type specification which allows attribute
-     declarations-->
-<!-- -->
-
-<!ELEMENT %complexType; ((%annotation;)?,
-                         (%simpleContent;|%complexContent;|
-                          %particleAndAttrs;))>
-
-<!ATTLIST %complexType;
-          name      %NCName;                        #IMPLIED
-          id        ID                              #IMPLIED
-          abstract  %boolean;                       #IMPLIED
-          final     %complexDerivationSet;          #IMPLIED
-          block     %complexDerivationSet;          #IMPLIED
-          mixed (true|false) 'false'
-          %complexTypeAttrs;>
-
-<!-- particleAndAttrs is shorthand for a root type -->
-<!-- mixed is disallowed if simpleContent, overriden if complexContent
-     has one too. -->
-
-<!-- If anyAttribute appears in one or more referenced attributeGroups
-     and/or explicitly, the intersection of the permissions is used -->
-
-<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %complexContent;
-          mixed (true|false) #IMPLIED
-          id    ID           #IMPLIED
-          %complexContentAttrs;>
-
-<!-- restriction should use the branch defined above, not the simple
-     one from part2; extension should use the full model  -->
-
-<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %simpleContent;
-          id    ID           #IMPLIED
-          %simpleContentAttrs;>
-
-<!-- restriction should use the simple branch from part2, not the 
-     one defined above; extension should have no particle  -->
-
-<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
-<!ATTLIST %extension;
-          base  %QName;      #REQUIRED
-          id    ID           #IMPLIED
-          %extensionAttrs;>
-
-<!-- an element is declared by either:
- a name and a type (either nested or referenced via the type attribute)
- or a ref to an existing element declaration -->
-
-<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
-                     (%unique; | %key; | %keyref;)*)>
-<!-- simpleType or complexType only if no type|ref attribute -->
-<!-- ref not allowed at top level -->
-<!ATTLIST %element;
-            name               %NCName;               #IMPLIED
-            id                 ID                     #IMPLIED
-            ref                %QName;                #IMPLIED
-            type               %QName;                #IMPLIED
-            minOccurs          %nonNegativeInteger;   #IMPLIED
-            maxOccurs          CDATA                  #IMPLIED
-            nillable           %boolean;              #IMPLIED
-            substitutionGroup  %QName;                #IMPLIED
-            abstract           %boolean;              #IMPLIED
-            final              %complexDerivationSet; #IMPLIED
-            block              %blockSet;             #IMPLIED
-            default            CDATA                  #IMPLIED
-            fixed              CDATA                  #IMPLIED
-            form               %formValues;           #IMPLIED
-            %elementAttrs;>
-<!-- type and ref are mutually exclusive.
-     name and ref are mutually exclusive, one is required -->
-<!-- In the absence of type AND ref, type defaults to type of
-     substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
-<!-- default and fixed are mutually exclusive -->
-
-<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group; 
-          name        %NCName;               #IMPLIED
-          ref         %QName;                #IMPLIED
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %groupAttrs;>
-
-<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
-<!ATTLIST %all;
-          minOccurs   (1)                    #IMPLIED
-          maxOccurs   (1)                    #IMPLIED
-          id          ID                     #IMPLIED
-          %allAttrs;>
-
-<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %choice;
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %choiceAttrs;>
-
-<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %sequence;
-          minOccurs   %nonNegativeInteger;   #IMPLIED
-          maxOccurs   CDATA                  #IMPLIED
-          id          ID                     #IMPLIED
-          %sequenceAttrs;>
-
-<!-- an anonymous grouping in a model, or
-     a top-level named group definition, or a reference to same -->
-
-<!-- Note that if order is 'all', group is not allowed inside.
-     If order is 'all' THIS group must be alone (or referenced alone) at
-     the top level of a content model -->
-<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
-<!-- Should allow minOccurs=0 inside order='all' . . . -->
-
-<!ELEMENT %any; (%annotation;)?>
-<!ATTLIST %any;
-            namespace       CDATA                  '##any'
-            processContents (skip|lax|strict)      'strict'
-            minOccurs       %nonNegativeInteger;   '1'
-            maxOccurs       CDATA                  '1'
-            id              ID                     #IMPLIED
-            %anyAttrs;>
-
-<!-- namespace is interpreted as follows:
-                  ##any      - - any non-conflicting WFXML at all
-
-                  ##other    - - any non-conflicting WFXML from namespace other
-                                  than targetNamespace
-
-                  ##local    - - any unqualified non-conflicting WFXML/attribute
-                  one or     - - any non-conflicting WFXML from
-                  more URI        the listed namespaces
-                  references
-
-                  ##targetNamespace ##local may appear in the above list,
-                    with the obvious meaning -->
-
-<!ELEMENT %anyAttribute; (%annotation;)?>
-<!ATTLIST %anyAttribute;
-            namespace       CDATA              '##any'
-            processContents (skip|lax|strict)  'strict'
-            id              ID                 #IMPLIED
-            %anyAttributeAttrs;>
-<!-- namespace is interpreted as for 'any' above -->
-
-<!-- simpleType only if no type|ref attribute -->
-<!-- ref not allowed at top level, name iff at top level -->
-<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
-<!ATTLIST %attribute;
-          name      %NCName;      #IMPLIED
-          id        ID            #IMPLIED
-          ref       %QName;       #IMPLIED
-          type      %QName;       #IMPLIED
-          use       (prohibited|optional|required) #IMPLIED
-          default   CDATA         #IMPLIED
-          fixed     CDATA         #IMPLIED
-          form      %formValues;  #IMPLIED
-          %attributeAttrs;>
-<!-- type and ref are mutually exclusive.
-     name and ref are mutually exclusive, one is required -->
-<!-- default for use is optional when nested, none otherwise -->
-<!-- default and fixed are mutually exclusive -->
-<!-- type attr and simpleType content are mutually exclusive -->
-
-<!-- an attributeGroup is a named collection of attribute decls, or a
-     reference thereto -->
-<!ELEMENT %attributeGroup; ((%annotation;)?,
-                       (%attribute; | %attributeGroup;)*,
-                       (%anyAttribute;)?) >
-<!ATTLIST %attributeGroup;
-                 name       %NCName;       #IMPLIED
-                 id         ID             #IMPLIED
-                 ref        %QName;        #IMPLIED
-                 %attributeGroupAttrs;>
-
-<!-- ref iff no content, no name.  ref iff not top level -->
-
-<!-- better reference mechanisms -->
-<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %unique;
-          name     %NCName;       #REQUIRED
-	  id       ID             #IMPLIED
-	  %uniqueAttrs;>
-
-<!ELEMENT %key;    ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %key;
-          name     %NCName;       #REQUIRED
-	  id       ID             #IMPLIED
-	  %keyAttrs;>
-
-<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %keyref;
-          name     %NCName;       #REQUIRED
-	  refer    %QName;        #REQUIRED
-	  id       ID             #IMPLIED
-	  %keyrefAttrs;>
-
-<!ELEMENT %selector; ((%annotation;)?)>
-<!ATTLIST %selector;
-          xpath %XPathExpr; #REQUIRED
-          id    ID          #IMPLIED
-          %selectorAttrs;>
-<!ELEMENT %field; ((%annotation;)?)>
-<!ATTLIST %field;
-          xpath %XPathExpr; #REQUIRED
-          id    ID          #IMPLIED
-          %fieldAttrs;>
-
-<!-- Schema combination mechanisms -->
-<!ELEMENT %include; (%annotation;)?>
-<!ATTLIST %include;
-          schemaLocation %URIref; #REQUIRED
-          id             ID       #IMPLIED
-          %includeAttrs;>
-
-<!ELEMENT %import; (%annotation;)?>
-<!ATTLIST %import;
-          namespace      %URIref; #IMPLIED
-          schemaLocation %URIref; #IMPLIED
-          id             ID       #IMPLIED
-          %importAttrs;>
-
-<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
-                      %attributeGroup; | %group;)*>
-<!ATTLIST %redefine;
-          schemaLocation %URIref; #REQUIRED
-          id             ID       #IMPLIED
-          %redefineAttrs;>
-
-<!ELEMENT %notation; (%annotation;)?>
-<!ATTLIST %notation;
-	  name        %NCName;    #REQUIRED
-	  id          ID          #IMPLIED
-	  public      CDATA       #REQUIRED
-	  system      %URIref;    #IMPLIED
-	  %notationAttrs;>
-
-<!-- Annotation is either application information or documentation -->
-<!-- By having these here they are available for datatypes as well
-     as all the structures elements -->
-
-<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
-<!ATTLIST %annotation; %annotationAttrs;>
-
-<!-- User must define annotation elements in internal subset for this
-     to work -->
-<!ELEMENT %appinfo; ANY>   <!-- too restrictive -->
-<!ATTLIST %appinfo;
-          source     %URIref;      #IMPLIED
-          id         ID         #IMPLIED
-          %appinfoAttrs;>
-<!ELEMENT %documentation; ANY>   <!-- too restrictive -->
-<!ATTLIST %documentation;
-          source     %URIref;   #IMPLIED
-          id         ID         #IMPLIED
-          xml:lang   CDATA      #IMPLIED
-          %documentationAttrs;>
-
-<!NOTATION XMLSchemaStructures PUBLIC
-           'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
-<!NOTATION XML PUBLIC
-           'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
deleted file mode 100644
index 685e89a57e..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ /dev/null
@@ -1,204 +0,0 @@
-<!--

-        DTD for XML Schemas: Part 2: Datatypes

-        $Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $

-        Note this DTD is NOT normative, or even definitive. - - the

-        prose copy in the datatypes REC is the definitive version

-        (which shouldn't differ from this one except for this comment

-        and entity expansions, but just in case)

-  -->

-

-<!--

-        This DTD cannot be used on its own, it is intended

-        only for incorporation in XMLSchema.dtd, q.v.

-  -->

-

-<!-- Define all the element names, with optional prefix -->

-<!ENTITY % simpleType "%p;simpleType">

-<!ENTITY % restriction "%p;restriction">

-<!ENTITY % list "%p;list">

-<!ENTITY % union "%p;union">

-<!ENTITY % maxExclusive "%p;maxExclusive">

-<!ENTITY % minExclusive "%p;minExclusive">

-<!ENTITY % maxInclusive "%p;maxInclusive">

-<!ENTITY % minInclusive "%p;minInclusive">

-<!ENTITY % totalDigits "%p;totalDigits">

-<!ENTITY % fractionDigits "%p;fractionDigits">

-<!ENTITY % length "%p;length">

-<!ENTITY % minLength "%p;minLength">

-<!ENTITY % maxLength "%p;maxLength">

-<!ENTITY % enumeration "%p;enumeration">

-<!ENTITY % whiteSpace "%p;whiteSpace">

-<!ENTITY % pattern "%p;pattern">

-

-<!--

-        Customisation entities for the ATTLIST of each element

-        type. Define one of these if your schema takes advantage

-        of the anyAttribute='##other' in the schema for schemas

-  -->

-

-<!ENTITY % simpleTypeAttrs "">

-<!ENTITY % restrictionAttrs "">

-<!ENTITY % listAttrs "">

-<!ENTITY % unionAttrs "">

-<!ENTITY % maxExclusiveAttrs "">

-<!ENTITY % minExclusiveAttrs "">

-<!ENTITY % maxInclusiveAttrs "">

-<!ENTITY % minInclusiveAttrs "">

-<!ENTITY % totalDigitsAttrs "">

-<!ENTITY % fractionDigitsAttrs "">

-<!ENTITY % lengthAttrs "">

-<!ENTITY % minLengthAttrs "">

-<!ENTITY % maxLengthAttrs "">

-<!ENTITY % enumerationAttrs "">

-<!ENTITY % whiteSpaceAttrs "">

-<!ENTITY % patternAttrs "">

-

-<!-- Define some entities for informative use as attribute

-        types -->

-<!ENTITY % URIref "CDATA">

-<!ENTITY % XPathExpr "CDATA">

-<!ENTITY % QName "NMTOKEN">

-<!ENTITY % QNames "NMTOKENS">

-<!ENTITY % NCName "NMTOKEN">

-<!ENTITY % nonNegativeInteger "NMTOKEN">

-<!ENTITY % boolean "(true|false)">

-<!ENTITY % simpleDerivationSet "CDATA">

-<!--

-        #all or space-separated list drawn from derivationChoice

-  -->

-

-<!--

-        Note that the use of 'facet' below is less restrictive

-        than is really intended:  There should in fact be no

-        more than one of each of minInclusive, minExclusive,

-        maxInclusive, maxExclusive, totalDigits, fractionDigits,

-        length, maxLength, minLength within datatype,

-        and the min- and max- variants of Inclusive and Exclusive

-        are mutually exclusive. On the other hand,  pattern and

-        enumeration may repeat.

-  -->

-<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">

-<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">

-<!ENTITY % bounds "%minBound; | %maxBound;">

-<!ENTITY % numeric "%totalDigits; | %fractionDigits;">

-<!ENTITY % ordered "%bounds; | %numeric;">

-<!ENTITY % unordered

-   "%pattern; | %enumeration; | %whiteSpace; | %length; |

-   %maxLength; | %minLength;">

-<!ENTITY % facet "%ordered; | %unordered;">

-<!ENTITY % facetAttr

-        "value CDATA #REQUIRED

-        id ID #IMPLIED">

-<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">

-<!ENTITY % facetModel "(%annotation;)?">

-<!ELEMENT %simpleType;

-        ((%annotation;)?, (%restriction; | %list; | %union;))>

-<!ATTLIST %simpleType;

-    name      %NCName; #IMPLIED

-    final     %simpleDerivationSet; #IMPLIED

-    id        ID       #IMPLIED

-    %simpleTypeAttrs;>

-<!-- name is required at top level -->

-<!ELEMENT %restriction; ((%annotation;)?,

-                         (%restriction1; |

-                          ((%simpleType;)?,(%facet;)*)),

-                         (%attrDecls;))>

-<!ATTLIST %restriction;

-    base      %QName;                  #IMPLIED

-    id        ID       #IMPLIED

-    %restrictionAttrs;>

-<!--

-        base and simpleType child are mutually exclusive,

-        one is required.

-

-        restriction is shared between simpleType and

-        simpleContent and complexContent (in XMLSchema.xsd).

-        restriction1 is for the latter cases, when this

-        is restricting a complex type, as is attrDecls.

-  -->

-<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>

-<!ATTLIST %list;

-    itemType      %QName;             #IMPLIED

-    id        ID       #IMPLIED

-    %listAttrs;>

-<!--

-        itemType and simpleType child are mutually exclusive,

-        one is required

-  -->

-<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>

-<!ATTLIST %union;

-    id            ID       #IMPLIED

-    memberTypes   %QNames;            #IMPLIED

-    %unionAttrs;>

-<!--

-        At least one item in memberTypes or one simpleType

-        child is required

-  -->

-

-<!ELEMENT %maxExclusive; %facetModel;>

-<!ATTLIST %maxExclusive;

-        %facetAttr;

-        %fixedAttr;

-        %maxExclusiveAttrs;>

-<!ELEMENT %minExclusive; %facetModel;>

-<!ATTLIST %minExclusive;

-        %facetAttr;

-        %fixedAttr;

-        %minExclusiveAttrs;>

-

-<!ELEMENT %maxInclusive; %facetModel;>

-<!ATTLIST %maxInclusive;

-        %facetAttr;

-        %fixedAttr;

-        %maxInclusiveAttrs;>

-<!ELEMENT %minInclusive; %facetModel;>

-<!ATTLIST %minInclusive;

-        %facetAttr;

-        %fixedAttr;

-        %minInclusiveAttrs;>

-

-<!ELEMENT %totalDigits; %facetModel;>

-<!ATTLIST %totalDigits;

-        %facetAttr;

-        %fixedAttr;

-        %totalDigitsAttrs;>

-<!ELEMENT %fractionDigits; %facetModel;>

-<!ATTLIST %fractionDigits;

-        %facetAttr;

-        %fixedAttr;

-        %fractionDigitsAttrs;>

-

-<!ELEMENT %length; %facetModel;>

-<!ATTLIST %length;

-        %facetAttr;

-        %fixedAttr;

-        %lengthAttrs;>

-<!ELEMENT %minLength; %facetModel;>

-<!ATTLIST %minLength;

-        %facetAttr;

-        %fixedAttr;

-        %minLengthAttrs;>

-<!ELEMENT %maxLength; %facetModel;>

-<!ATTLIST %maxLength;

-        %facetAttr;

-        %fixedAttr;

-        %maxLengthAttrs;>

-

-<!-- This one can be repeated -->

-<!ELEMENT %enumeration; %facetModel;>

-<!ATTLIST %enumeration;

-        %facetAttr;

-        %enumerationAttrs;>

-

-<!ELEMENT %whiteSpace; %facetModel;>

-<!ATTLIST %whiteSpace;

-        %facetAttr;

-        %fixedAttr;

-        %whiteSpaceAttrs;>

-

-<!-- This one can be repeated -->

-<!ELEMENT %pattern; %facetModel;>

-<!ATTLIST %pattern;

-        %facetAttr;

-        %patternAttrs;>

-

diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
deleted file mode 100644
index 641798b17f..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2004. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2">
-	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-	<xsd:complexType name="AttributedString">
-		<xsd:annotation>
-			<xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute ref="wsu:Id"/>
-				<xsd:anyAttribute namespace="##other" processContents="lax"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="PasswordString">
-		<xsd:annotation>
-			<xsd:documentation>This type is used for password elements per Section 4.1.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:AttributedString">
-				<xsd:attribute name="Type" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="EncodedString">
-		<xsd:annotation>
-			<xsd:documentation>This type is used for elements containing stringified binary data.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:AttributedString">
-				<xsd:attribute name="EncodingType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="UsernameTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a username token per Section 4.1</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="Username" type="wsse:AttributedString"/>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-		<xsd:attribute ref="wsu:Id"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="BinarySecurityTokenType">
-		<xsd:annotation>
-			<xsd:documentation>A security token that is encoded in binary</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:EncodedString">
-				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="KeyIdentifierType">
-		<xsd:annotation>
-			<xsd:documentation>A security token key identifier</xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="wsse:EncodedString">
-				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="tUsage">
-		<xsd:annotation>
-			<xsd:documentation>Typedef to allow a list of usages (as URIs).</xsd:documentation>
-		</xsd:annotation>
-		<xsd:list itemType="xsd:anyURI"/>
-	</xsd:simpleType>
-	<xsd:attribute name="Usage" type="tUsage">
-		<xsd:annotation>
-			<xsd:documentation>This global attribute is used to indicate the usage of a referenced or indicated token within the containing context</xsd:documentation>
-		</xsd:annotation>
-	</xsd:attribute>
-	<xsd:complexType name="ReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a reference to an external security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute name="URI" type="xsd:anyURI"/>
-		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="EmbeddedType">
-		<xsd:annotation>
-			<xsd:documentation>This type represents a reference to an embedded security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:any processContents="lax"/>
-		</xsd:choice>
-		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="SecurityTokenReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This type is used reference a security token.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:any processContents="lax"/>
-		</xsd:choice>
-		<xsd:attribute ref="wsu:Id"/>
-		<xsd:attribute ref="wsse:Usage"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="SecurityHeaderType">
-		<xsd:annotation>
-			<xsd:documentation>This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>The use of "any" is to allow extensibility and different forms of security data.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:any>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:complexType name="TransformationParametersType">
-		<xsd:annotation>
-			<xsd:documentation>This complexType defines a container for elements to be specified from any namespace as properties/parameters of a DSIG transformation.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xsd:annotation>
-					<xsd:documentation>The use of "any" is to allow extensibility from any namespace.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:any>
-		</xsd:sequence>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:complexType>
-	<xsd:element name="UsernameToken" type="wsse:UsernameTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:UsernameToken element per Section 4.1.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:BinarySecurityToken element per Section 4.2.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Reference" type="wsse:ReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a security token reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Embedded" type="wsse:EmbeddedType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a security token embedded reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="KeyIdentifier" type="wsse:KeyIdentifierType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines a key identifier reference</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="SecurityTokenReference" type="wsse:SecurityTokenReferenceType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:SecurityTokenReference per Section 4.3.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Security" type="wsse:SecurityHeaderType">
-		<xsd:annotation>
-			<xsd:documentation>This element defines the wsse:Security SOAP header element per Section 4.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="TransformationParameters" type="wsse:TransformationParametersType">
-		<xsd:annotation>
-			<xsd:documentation>This element contains properties for transformations from any namespace, including DSIG.</xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Password" type="wsse:PasswordString"/>
-	<xsd:element name="Nonce" type="wsse:EncodedString"/>
-	<xsd:simpleType name="FaultcodeEnum">
-		<xsd:restriction base="xsd:QName">
-			<xsd:enumeration value="wsse:UnsupportedSecurityToken"/>
-			<xsd:enumeration value="wsse:UnsupportedAlgorithm"/>
-			<xsd:enumeration value="wsse:InvalidSecurity"/>
-			<xsd:enumeration value="wsse:InvalidSecurityToken"/>
-			<xsd:enumeration value="wsse:FailedAuthentication"/>
-			<xsd:enumeration value="wsse:FailedCheck"/>
-			<xsd:enumeration value="wsse:SecurityTokenUnavailable"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-</xsd:schema>
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
deleted file mode 100644
index f8d74e9c6e..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-Copyright © OASIS Open 2002-2004. All Rights Reserved.
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
-This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
--->
-<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-
-
-
-xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
-elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
-	<!-- // Fault Codes /////////////////////////////////////////// -->
-	<xsd:simpleType name="tTimestampFault">
-		<xsd:annotation>
-			<xsd:documentation>
-This type defines the fault code value for Timestamp message expiration.
-          </xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:QName">
-			<xsd:enumeration value="wsu:MessageExpired"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<!-- // Global attributes //////////////////////////////////// -->
-	<xsd:attribute name="Id" type="xsd:ID">
-		<xsd:annotation>
-			<xsd:documentation>
-This global attribute supports annotating arbitrary elements with an ID.
-          </xsd:documentation>
-		</xsd:annotation>
-	</xsd:attribute>
-	<xsd:attributeGroup name="commonAtts">
-		<xsd:annotation>
-			<xsd:documentation>
-Convenience attribute group used to simplify this schema.
-          </xsd:documentation>
-		</xsd:annotation>
-		<xsd:attribute ref="wsu:Id" use="optional"/>
-		<xsd:anyAttribute namespace="##other" processContents="lax"/>
-	</xsd:attributeGroup>
-	<!-- // Utility types //////////////////////////////////////// -->
-	<xsd:complexType name="AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. 
-      </xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attributeGroup ref="wsu:commonAtts"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="AttributedURI">
-		<xsd:annotation>
-			<xsd:documentation>
-This type is for elements whose [children] is an anyURI and can have arbitrary attributes.
-      </xsd:documentation>
-		</xsd:annotation>
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:anyURI">
-				<xsd:attributeGroup ref="wsu:commonAtts"/>
-			</xsd:extension>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<!-- // Timestamp header components /////////////////////////// -->
-	<xsd:complexType name="TimestampType">
-		<xsd:annotation>
-			<xsd:documentation>
-This complex type ties together the timestamp related elements into a composite type.
-            </xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element ref="wsu:Created" minOccurs="0"/>
-			<xsd:element ref="wsu:Expires" minOccurs="0"/>
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:any namespace="##other" processContents="lax"/>
-			</xsd:choice>
-		</xsd:sequence>
-		<xsd:attributeGroup ref="wsu:commonAtts"/>
-	</xsd:complexType>
-	<xsd:element name="Timestamp" type="wsu:TimestampType">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows Timestamps to be applied anywhere element wildcards are present,
-including as a SOAP header.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<!-- global element decls to allow individual elements to appear anywhere -->
-	<xsd:element name="Expires" type="wsu:AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows an expiration time to be applied anywhere element wildcards are present.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-	<xsd:element name="Created" type="wsu:AttributedDateTime">
-		<xsd:annotation>
-			<xsd:documentation>
-This element allows a creation time to be applied anywhere element wildcards are present.
-            </xsd:documentation>
-		</xsd:annotation>
-	</xsd:element>
-</xsd:schema>
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
deleted file mode 100644
index f6fc9c53b0..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    W3C XML Schema defined in the Web Services Addressing 1.0 specification
-    http://www.w3.org/TR/ws-addr-core
-
-   Copyright © 2005 World Wide Web Consortium,
-
-   (Massachusetts Institute of Technology, European Research Consortium for
-   Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C® Software License [1] in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-   $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
-
-    <!-- Constructs from the WS-Addressing Core -->
-
-    <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
-    <xs:complexType name="EndpointReferenceType" mixed="false">
-        <xs:sequence>
-            <xs:element name="Address" type="tns:AttributedURIType"/>
-            <xs:element ref="tns:ReferenceParameters" minOccurs="0"/>
-            <xs:element ref="tns:Metadata" minOccurs="0"/>
-            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-    <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>
-    <xs:complexType name="ReferenceParametersType" mixed="false">
-        <xs:sequence>
-            <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-    <xs:element name="Metadata" type="tns:MetadataType"/>
-    <xs:complexType name="MetadataType" mixed="false">
-        <xs:sequence>
-            <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-    <xs:element name="MessageID" type="tns:AttributedURIType"/>
-    <xs:element name="RelatesTo" type="tns:RelatesToType"/>
-    <xs:complexType name="RelatesToType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:anyURI">
-                <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:simpleType name="RelationshipTypeOpenEnum">
-        <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="RelationshipType">
-        <xs:restriction base="xs:anyURI">
-            <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
-    <xs:element name="From" type="tns:EndpointReferenceType"/>
-    <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
-    <xs:element name="To" type="tns:AttributedURIType"/>
-    <xs:element name="Action" type="tns:AttributedURIType"/>
-
-    <xs:complexType name="AttributedURIType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:anyURI">
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <!-- Constructs from the WS-Addressing SOAP binding -->
-
-    <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
-
-    <xs:simpleType name="FaultCodesOpenEnumType">
-        <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
-    </xs:simpleType>
-
-    <xs:simpleType name="FaultCodesType">
-        <xs:restriction base="xs:QName">
-            <xs:enumeration value="tns:InvalidAddressingHeader"/>
-            <xs:enumeration value="tns:InvalidAddress"/>
-            <xs:enumeration value="tns:InvalidEPR"/>
-            <xs:enumeration value="tns:InvalidCardinality"/>
-            <xs:enumeration value="tns:MissingAddressInEPR"/>
-            <xs:enumeration value="tns:DuplicateMessageID"/>
-            <xs:enumeration value="tns:ActionMismatch"/>
-            <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
-            <xs:enumeration value="tns:DestinationUnreachable"/>
-            <xs:enumeration value="tns:ActionNotSupported"/>
-            <xs:enumeration value="tns:EndpointUnavailable"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
-    <xs:complexType name="AttributedUnsignedLongType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:unsignedLong">
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
-    <xs:complexType name="AttributedQNameType" mixed="false">
-        <xs:simpleContent>
-            <xs:extension base="xs:QName">
-                <xs:anyAttribute namespace="##other" processContents="lax"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
-
-    <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
-    <xs:complexType name="ProblemActionType" mixed="false">
-        <xs:sequence>
-            <xs:element ref="tns:Action" minOccurs="0"/>
-            <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:complexType>
-
-</xs:schema>
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
deleted file mode 100644
index c43e5814ed..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!--
-
-    W3C XML Schema defined in the Web Services Policy 1.5
-    Framework specification
-
-    http://www.w3.org/TR/ws-policy-framework
-
-   Copyright © 2006 World Wide Web Consortium,
-
-   (Massachusetts Institute of Technology, European Research Consortium for
-   Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C® Software License [1] in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-   $Id: ws-policy.xsd,v 1.2 2007/02/14 16:38:37 fsasaki Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:tns="http://www.w3.org/ns/ws-policy"
-    xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-    xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-    targetNamespace="http://www.w3.org/ns/ws-policy" blockDefault="#all"
-    elementFormDefault="qualified">
-
-  <xs:import
-      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" />
-
-  <xs:import
-      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" />
-
-  <xs:import
-      namespace="http://www.w3.org/XML/1998/namespace"
-      schemaLocation="http://www.w3.org/2001/xml.xsd" />
-
-    <!-- Constructs from the Web Services Policy 1.5 Framework -->
-
-  <xs:element name="Policy" >
-    <xs:complexType>
-
-      <xs:complexContent>
-        <xs:extension base="tns:OperatorContentType" >
-          <xs:attribute name="Name" type="xs:anyURI" />
-          <xs:anyAttribute namespace="##any" processContents="lax" />
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="All" type="tns:OperatorContentType" />
-  <xs:element name="ExactlyOne" type="tns:OperatorContentType" />
-
-  <xs:complexType name="OperatorContentType" >
-    <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded" >
-        <xs:element ref="tns:Policy" />
-        <xs:element ref="tns:All" />
-        <xs:element ref="tns:ExactlyOne" />
-
-        <xs:element ref="tns:PolicyReference" />
-        <xs:any namespace="##other" processContents="lax" />
-      </xs:choice>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:element name="PolicyReference" >
-    <xs:complexType>
-      <xs:sequence>
-        <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="URI" type="xs:anyURI" use="required" />
-
-      <xs:attribute name="Digest" type="xs:base64Binary" />
-      <xs:attribute name="DigestAlgorithm"
-                    type="xs:anyURI"
-                    default="http://www.w3.org/ns/ws-policy/Sha1Exc"
-                    />
-      <xs:anyAttribute namespace="##any" processContents="lax" />
-    </xs:complexType>
-  </xs:element>
-
-  <xs:attribute name="Optional" type="xs:boolean" default="false" />
-  <xs:attribute name="Ignorable" type="xs:boolean" default="false" />
-
-    <!-- Constructs from the Web Services Policy 1.5 Attachment -->
-
-  <xs:attribute name="PolicyURIs" >
-    <xs:simpleType>
-      <xs:list itemType="xs:anyURI" />
-    </xs:simpleType>
-  </xs:attribute>
-
-  <xs:element name="PolicyAttachment" >
-    <xs:complexType>
-      <xs:sequence>
-
-        <xs:element ref="tns:AppliesTo" />
-        <xs:choice maxOccurs="unbounded" >
-          <xs:element ref="tns:Policy" />
-          <xs:element ref="tns:PolicyReference" />
-        </xs:choice>
-        <!-- omitted only because it causes the content model to be non-determistic
-        <xs:element ref="wsse:Security" minOccurs="0" />
--->
-        <xs:any namespace="##other"
-        processContents="lax"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      </xs:sequence>
-      <xs:anyAttribute namespace="##any" processContents="lax" />
-
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="AppliesTo" >
-    <xs:complexType>
-      <xs:sequence>
-        <xs:any namespace="##any"
-        processContents="lax"
-        maxOccurs="unbounded" />
-      </xs:sequence>
-      <xs:anyAttribute namespace="##any" processContents="lax" />
-
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="URI">
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="xs:anyURI">
-          <xs:anyAttribute namespace="##any" processContents="lax" />
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-
-</xs:schema>
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
deleted file mode 100644
index 24e0b5a975..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
-<!--
-   W3C XML Schema defined in the Web Services Description (WSDL)
-    Version 2.0 specification
-     http://www.w3.org/TR/wsdl20
-
-   Copyright © 2007 World Wide Web Consortium,
-
-   (Massachusetts Institute of Technology, European Research Consortium for
-   Informatics and Mathematics, Keio University). All Rights Reserved. This
-   work is distributed under the W3C® Software License [1] in the hope that
-   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-   $Id: wsdl20-instance.xsd,v 1.1 2007/06/19 15:59:38 plehegar Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/ns/wsdl-instance" targetNamespace="http://www.w3.org/ns/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
-
-  <xs:attribute name="wsdlLocation">
-    <xs:annotation>
-      <xs:documentation>
-      This attribute can be used to provide some hints on where
-      additional WSDL information for a given namespace can be
-      found in order to help with QName resolution
-      </xs:documentation>
-    </xs:annotation>
-    <xs:simpleType>
-      <xs:list itemType="xs:anyURI"/>
-    </xs:simpleType>
-  </xs:attribute>
-
-</xs:schema>
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
deleted file mode 100644
index ac4b0ec8e6..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of
-         the original XML Working Group.  This name is reserved by
-         the following decision of the W3C XML Plenary and
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
-
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang" type="xs:language">
-  <xs:annotation>
-   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
deleted file mode 100644
index 16c791e533..0000000000
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
-  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
- [
-   <!ATTLIST schema 
-     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
-   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
-   <!ENTITY % p ''>
-   <!ENTITY % s ''>
-  ]>
-
-<!-- Schema for XML Signatures
-    http://www.w3.org/2000/09/xmldsig#
-    $Revision$ on $Date$ by $Author: reagle $
-
-    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
-    of Technology, Institut National de Recherche en Informatique et en
-    Automatique, Keio University). All Rights Reserved.
-    http://www.w3.org/Consortium/Legal/
-
-    This document is governed by the W3C Software License [1] as described
-    in the FAQ [2].
-
-    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
-        version="0.1" elementFormDefault="qualified"> 
-
-<!-- Basic Types Defined for Signatures -->
-
-<simpleType name="CryptoBinary">
-  <restriction base="base64Binary">
-  </restriction>
-</simpleType>
-
-<!-- Start Signature -->
-
-<element name="Signature" type="ds:SignatureType"/>
-<complexType name="SignatureType">
-  <sequence> 
-    <element ref="ds:SignedInfo"/> 
-    <element ref="ds:SignatureValue"/> 
-    <element ref="ds:KeyInfo" minOccurs="0"/> 
-    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/>
-</complexType>
-
-  <element name="SignatureValue" type="ds:SignatureValueType"/> 
-  <complexType name="SignatureValueType">
-    <simpleContent>
-      <extension base="base64Binary">
-        <attribute name="Id" type="ID" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-<!-- Start SignedInfo -->
-
-<element name="SignedInfo" type="ds:SignedInfoType"/>
-<complexType name="SignedInfoType">
-  <sequence> 
-    <element ref="ds:CanonicalizationMethod"/> 
-    <element ref="ds:SignatureMethod"/> 
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
-  <complexType name="CanonicalizationMethodType" mixed="true">
-    <sequence>
-      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
-  <complexType name="SignatureMethodType" mixed="true">
-    <sequence>
-      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) external namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- Start Reference -->
-
-<element name="Reference" type="ds:ReferenceType"/>
-<complexType name="ReferenceType">
-  <sequence> 
-    <element ref="ds:Transforms" minOccurs="0"/> 
-    <element ref="ds:DigestMethod"/> 
-    <element ref="ds:DigestValue"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="URI" type="anyURI" use="optional"/> 
-  <attribute name="Type" type="anyURI" use="optional"/> 
-</complexType>
-
-  <element name="Transforms" type="ds:TransformsType"/>
-  <complexType name="TransformsType">
-    <sequence>
-      <element ref="ds:Transform" maxOccurs="unbounded"/>  
-    </sequence>
-  </complexType>
-
-  <element name="Transform" type="ds:TransformType"/>
-  <complexType name="TransformType" mixed="true">
-    <choice minOccurs="0" maxOccurs="unbounded"> 
-      <any namespace="##other" processContents="lax"/>
-      <!-- (1,1) elements from (0,unbounded) namespaces -->
-      <element name="XPath" type="string"/> 
-    </choice>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- End Reference -->
-
-<element name="DigestMethod" type="ds:DigestMethodType"/>
-<complexType name="DigestMethodType" mixed="true"> 
-  <sequence>
-    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </sequence>    
-  <attribute name="Algorithm" type="anyURI" use="required"/> 
-</complexType>
-
-<element name="DigestValue" type="ds:DigestValueType"/>
-<simpleType name="DigestValueType">
-  <restriction base="base64Binary"/>
-</simpleType>
-
-<!-- End SignedInfo -->
-
-<!-- Start KeyInfo -->
-
-<element name="KeyInfo" type="ds:KeyInfoType"/> 
-<complexType name="KeyInfoType" mixed="true">
-  <choice maxOccurs="unbounded">     
-    <element ref="ds:KeyName"/> 
-    <element ref="ds:KeyValue"/> 
-    <element ref="ds:RetrievalMethod"/> 
-    <element ref="ds:X509Data"/> 
-    <element ref="ds:PGPData"/> 
-    <element ref="ds:SPKIData"/>
-    <element ref="ds:MgmtData"/>
-    <any processContents="lax" namespace="##other"/>
-    <!-- (1,1) elements from (0,unbounded) namespaces -->
-  </choice>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="KeyName" type="string"/>
-  <element name="MgmtData" type="string"/>
-
-  <element name="KeyValue" type="ds:KeyValueType"/> 
-  <complexType name="KeyValueType" mixed="true">
-   <choice>
-     <element ref="ds:DSAKeyValue"/>
-     <element ref="ds:RSAKeyValue"/>
-     <any namespace="##other" processContents="lax"/>
-   </choice>
-  </complexType>
-
-  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
-  <complexType name="RetrievalMethodType">
-    <sequence>
-      <element ref="ds:Transforms" minOccurs="0"/> 
-    </sequence>  
-    <attribute name="URI" type="anyURI"/>
-    <attribute name="Type" type="anyURI" use="optional"/>
-  </complexType>
-
-<!-- Start X509Data -->
-
-<element name="X509Data" type="ds:X509DataType"/> 
-<complexType name="X509DataType">
-  <sequence maxOccurs="unbounded">
-    <choice>
-      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
-      <element name="X509SKI" type="base64Binary"/>
-      <element name="X509SubjectName" type="string"/>
-      <element name="X509Certificate" type="base64Binary"/>
-      <element name="X509CRL" type="base64Binary"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </sequence>
-</complexType>
-
-<complexType name="X509IssuerSerialType"> 
-  <sequence> 
-    <element name="X509IssuerName" type="string"/> 
-    <element name="X509SerialNumber" type="integer"/> 
-  </sequence>
-</complexType>
-
-<!-- End X509Data -->
-
-<!-- Begin PGPData -->
-
-<element name="PGPData" type="ds:PGPDataType"/> 
-<complexType name="PGPDataType"> 
-  <choice>
-    <sequence>
-      <element name="PGPKeyID" type="base64Binary"/> 
-      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-    <sequence>
-      <element name="PGPKeyPacket" type="base64Binary"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </choice>
-</complexType>
-
-<!-- End PGPData -->
-
-<!-- Begin SPKIData -->
-
-<element name="SPKIData" type="ds:SPKIDataType"/> 
-<complexType name="SPKIDataType">
-  <sequence maxOccurs="unbounded">
-    <element name="SPKISexp" type="base64Binary"/>
-    <any namespace="##other" processContents="lax" minOccurs="0"/>
-  </sequence>
-</complexType> 
-
-<!-- End SPKIData -->
-
-<!-- End KeyInfo -->
-
-<!-- Start Object (Manifest, SignatureProperty) -->
-
-<element name="Object" type="ds:ObjectType"/> 
-<complexType name="ObjectType" mixed="true">
-  <sequence minOccurs="0" maxOccurs="unbounded">
-    <any namespace="##any" processContents="lax"/>
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
-  <attribute name="Encoding" type="anyURI" use="optional"/> 
-</complexType>
-
-<element name="Manifest" type="ds:ManifestType"/> 
-<complexType name="ManifestType">
-  <sequence>
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
-<complexType name="SignaturePropertiesType">
-  <sequence>
-    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
-   <complexType name="SignaturePropertyType" mixed="true">
-     <choice maxOccurs="unbounded">
-       <any namespace="##other" processContents="lax"/>
-       <!-- (1,1) elements from (1,unbounded) namespaces -->
-     </choice>
-     <attribute name="Target" type="anyURI" use="required"/> 
-     <attribute name="Id" type="ID" use="optional"/> 
-   </complexType>
-
-<!-- End Object (Manifest, SignatureProperty) -->
-
-<!-- Start Algorithm Parameters -->
-
-<simpleType name="HMACOutputLengthType">
-  <restriction base="integer"/>
-</simpleType>
-
-<!-- Start KeyValue Element-types -->
-
-<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
-<complexType name="DSAKeyValueType">
-  <sequence>
-    <sequence minOccurs="0">
-      <element name="P" type="ds:CryptoBinary"/>
-      <element name="Q" type="ds:CryptoBinary"/>
-    </sequence>
-    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
-    <element name="Y" type="ds:CryptoBinary"/>
-    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
-    <sequence minOccurs="0">
-      <element name="Seed" type="ds:CryptoBinary"/>
-      <element name="PgenCounter" type="ds:CryptoBinary"/>
-    </sequence>
-  </sequence>
-</complexType>
-
-<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
-<complexType name="RSAKeyValueType">
-  <sequence>
-    <element name="Modulus" type="ds:CryptoBinary"/> 
-    <element name="Exponent" type="ds:CryptoBinary"/> 
-  </sequence>
-</complexType> 
-
-<!-- End KeyValue Element-types -->
-
-<!-- End Signature -->
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-1.1-cd04.xsd
deleted file mode 100644
index de4620f460..0000000000
--- a/cpp/sca/runtime/xsd/sca-1.1-cd04.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-   
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-   <include schemaLocation="sca-interface-java-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-interface-wsdl-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-interface-c-1.1-cd04.xsd"/>
-
-   <include schemaLocation="sca-implementation-java-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-implementation-composite-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-implementation-cpp-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-implementation-c-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-implementation-bpel-1.1-cd03.xsd"/>
-   <include schemaLocation="sca-implementation-spring-1.1-cd01.xsd"/>
-
-   <include schemaLocation="sca-binding-ws-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-binding-ws-callback-1.1-cd04.xsd"/> 		<!-- New -->  
-   <include schemaLocation="sca-binding-jms-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-binding-jca-1.1-cd04.xsd"/>   
-   <include schemaLocation="sca-binding-sca-1.1-cd04.xsd"/>
-
-   <include schemaLocation="sca-definitions-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
-
-   <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-contribution-cpp-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-contribution-c-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-contribution-java-1.1-cd02.xsd"/>
-   
-   <include schemaLocation="sca-jee-1.1-wd03.xsd"/>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-binding-jca-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-binding-jca-1.1-cd04.xsd
deleted file mode 100644
index 7f9baac45c..0000000000
--- a/cpp/sca/runtime/xsd/sca-binding-jca-1.1-cd04.xsd
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        elementFormDefault="qualified">
-        
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-   <complexType name="JCABinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-               <element name="outboundConnection" 
-                        type="sca:JCAOutboundConnection" minOccurs="0" />
-               <element name="inboundConnection" 
-                        type="sca:JCAInboundConnection" minOccurs="0" />
-               <element name="outboundInteraction" 
-                        type="sca:JCAOutboundInteraction" minOccurs="0" />
-               <element name="inboundInteraction" 
-                        type="sca:JCAInboundInteraction" minOccurs="0" />
-               <element name="property" type="sca:Property" minOccurs="0"
-                        maxOccurs="unbounded" />
-               <any namespace="##other" processContents="lax" minOccurs="0"
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="connectionInfo" type="anyURI" use="optional" />
-            <attribute name="initialContextFactory" type="anyURI" 
-                       use="optional"/>
-    	   <attribute name="jndiURL" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <simpleType name="JCACreateResource">
-      <restriction base="string">
-         <enumeration value="always" />
-         <enumeration value="never" />
-         <enumeration value="ifNotExist" />
-	    </restriction>
-   </simpleType>
-   <simpleType name="ResAuth">
-      <restriction base="string">
-         <enumeration value="container" />
-         <enumeration value="application" />
-      </restriction>
-   </simpleType>
-   <complexType name="JCAOutboundConnection">
-      <sequence>
-         <element name="resourceAdapter" type="sca:ResourceAdapter"
-                  minOccurs="0" />
-         <element name="connection" type="sca:Connection" />
-         <element name="resAuth" type="sca:ResAuth" minOccurs="0" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="managed" type="boolean" use="optional"	
-                default="true" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="JCAInboundConnection">
-      <sequence>
-         <element name="resourceAdapter" type="sca:ResourceAdapter" />
-         <element name="activationSpec" type="sca:ActivationSpec" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="JCAOutboundInteraction">
-      <sequence>
-         <element name="connectionSpec" type="sca:ConnectionSpec"
-                  minOccurs="0" />
-         <element name="interactionSpec" type="sca:InteractionSpec"
-                  minOccurs="0" />
-         <element name="operation" type="sca:Operation" minOccurs="0" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="JCAInboundInteraction">
-      <sequence>
-         <element name="listener" type="string" minOccurs="0" />
-         <element name="inboundOperation" type="sca:InboundOperation"
-                  minOccurs="0" maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="ResourceAdapter">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="name" type="NMTOKEN" use="optional" />
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="Connection">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="name" type="NMTOKEN" use="optional" />
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <attribute name="create" type="sca:JCACreateResource" use="optional"
-                 default="ifNotExist" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="ActivationSpec">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="name" type="NMTOKEN" use="optional" />
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <attribute name="create" type="sca:JCACreateResource" use="optional"
-                 default="ifNotExist"/>
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="Operation">
-      <sequence>
-         <element name="interactionSpec" type="sca:InteractionSpec"
-                  minOccurs="0" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="name" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="InboundOperation">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="required" />
-		<attribute name="nativeOperation" type="string" use="required" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-	<complexType name="ConnectionSpec">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-   <complexType name="InteractionSpec">
-      <sequence>
-         <element name="property" type="sca:Property" minOccurs="0"
-                  maxOccurs="unbounded" />
-         <any namespace="##other" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded" />
-      </sequence>
-      <attribute name="type" type="NMTOKEN" use="required" />
-      <anyAttribute namespace="##other" processContents="lax" />
-   </complexType>
-
-   <element name="binding.jca" type="sca:JCABinding"
-            substitutionGroup="sca:binding" />
-            
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-binding-jms-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-binding-jms-1.1-cd04.xsd
deleted file mode 100644
index e16039a0cd..0000000000
--- a/cpp/sca/runtime/xsd/sca-binding-jms-1.1-cd04.xsd
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-   <complexType name="JMSBinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-               <element name="destination" type="sca:JMSDestination"
-                        minOccurs="0"/> 
-               <choice minOccurs="0" maxOccurs="1"> 
-                  <element name="connectionFactory" 
-                           type="sca:JMSConnectionFactory"/> 
-                  <element name="activationSpec" type="sca:JMSActivationSpec"/> 
-               </choice>     
-               <element name="response" type="sca:JMSResponse" minOccurs="0"/>
-               <element name="headers" type="sca:JMSHeaders" minOccurs="0"/>
-               <element name="messageSelection" type="sca:JMSMessageSelection"
-                        minOccurs="0"/>
-               <element name="resourceAdapter" type="sca:JMSResourceAdapter" 
-                        minOccurs="0"/>
-               <element name="operationProperties" 
-                        type="sca:JMSOperationProperties" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <any namespace="##other" processContents="lax" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="correlationScheme" type="QName"
-                       default="sca:messageId"/>
-            <attribute name="initialContextFactory" type="anyURI"/>
-            <attribute name="jndiURL" type="anyURI"/>
-            <attribute name="requestConnection" type="QName"/>
-            <attribute name="responseConnection" type="QName"/>
-            <attribute name="operationProperties" type="QName"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <simpleType name="JMSCreateResource">
-      <restriction base="string">
-         <enumeration value="always"/>
-         <enumeration value="never"/>
-         <enumeration value="ifNotExist"/>
-      </restriction>
-   </simpleType>
-
-   <complexType name="JMSDestination">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="required"/>
-      <attribute name="type" use="optional" default="queue">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="queue"/>
-               <enumeration value="topic"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="create" type="sca:JMSCreateResource" 
-                 use="optional" default="ifNotExist"/>
-   </complexType>
-
-   <complexType name="JMSConnectionFactory">
-      <sequence>          <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="required"/>
-      <attribute name="create" type="sca:JMSCreateResource" 
-                 use="optional" default="ifNotExist"/>
-   </complexType>
-
-   <complexType name="JMSActivationSpec">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="jndiName" type="anyURI" use="required"/>
-      <attribute name="create" type="sca:JMSCreateResource"
-                 use="optional" default="ifNotExist"/>
-   </complexType>
-
-   <complexType name="JMSResponse">
-      <sequence>
-         <element name="wireFormat" type="sca:WireFormatType" minOccurs="0"/>
-         <element name="destination" type="sca:JMSDestination" minOccurs="0"/>
-         <choice minOccurs="0"> 
-            <element name="connectionFactory" type="sca:JMSConnectionFactory"/> 
-            <element name="activationSpec" type="sca:JMSActivationSpec"/> 
-         </choice> 
-      </sequence>
-   </complexType>
-
-   <complexType name="JMSHeaders">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="type" type="string"/>
-      <attribute name="deliveryMode">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="persistent"/>
-               <enumeration value="nonpersistent"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="timeToLive" type="long"/>
-      <attribute name="priority">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="0"/>
-               <enumeration value="1"/>
-               <enumeration value="2"/>
-               <enumeration value="3"/>
-               <enumeration value="4"/>
-               <enumeration value="5"/>
-               <enumeration value="6"/>
-               <enumeration value="7"/>
-               <enumeration value="8"/>
-               <enumeration value="9"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-   </complexType>
-
-   <complexType name="JMSMessageSelection"> 
-      <sequence> 
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/> 
-      </sequence> 
-      <attribute name="selector" type="string"/> 
-   </complexType>
-
-   <complexType name="JMSResourceAdapter">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-   </complexType>
-
-   <complexType name="JMSOperationProperties">
-      <sequence>
-         <element name="property" type="sca:BindingProperty" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-         <element name="headers" type="sca:JMSHeaders"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-      <attribute name="nativeOperation" type="string"/>
-   </complexType>
-
-   <complexType name="BindingProperty">
-      <simpleContent>
-         <extension base="string">
-            <attribute name="name" type="NMTOKEN"/>
-            <attribute name="type" type="string" use="optional"
-                       default="xs:string"/>
-         </extension>
-      </simpleContent>
-   </complexType>
-
-   <element name="binding.jms" type="sca:JMSBinding" 
-            substitutionGroup="sca:binding"/>
-
-   <element name="wireFormat.jmsDefault" type="sca:WireFormatType" 
-            substitutionGroup="sca:wireFormat"/>
-
-   <element name="operationSelector.jmsDefault" type="sca:OperationSelectorType" 
-            substitutionGroup="sca:operationSelector"/>
-</schema>
\ No newline at end of file
diff --git a/cpp/sca/runtime/xsd/sca-binding-sca-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-binding-sca-1.1-cd04.xsd
deleted file mode 100644
index 897e869806..0000000000
--- a/cpp/sca/runtime/xsd/sca-binding-sca-1.1-cd04.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-   <!-- SCA Binding -->
-   <element name="binding.sca" type="sca:SCABinding" 
-            substitutionGroup="sca:binding"/>
-   <complexType name="SCABinding">
-      <complexContent>
-         <extension base="sca:Binding"/>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-binding-ws-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-binding-ws-1.1-cd04.xsd
deleted file mode 100644
index 24198c943d..0000000000
--- a/cpp/sca/runtime/xsd/sca-binding-ws-1.1-cd04.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:wsdli="http://www.w3.org/ns/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2005/08/addressing"
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.w3.org/ns/wsdl-instance"
-            schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>
-    <import namespace="http://www.w3.org/2005/08/addressing"
-            schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
-
-    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <element name="endpointReference" type="wsa:EndpointReferenceType"
-                             minOccurs="0" maxOccurs="unbounded"/>
-                    <any namespace="##other" processContents="lax"
-                         minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <attribute ref="wsdli:wsdlLocation" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-binding-ws-callback-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-binding-ws-callback-1.1-cd04.xsd
deleted file mode 100644
index 4bc2e73d4c..0000000000
--- a/cpp/sca/runtime/xsd/sca-binding-ws-callback-1.1-cd04.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright OASIS 2005, 2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply -->
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    elementFormDefault="qualified">
-
-    <element name="WSCallback">
-        <complexType>
-            <sequence>
-                <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <anyAttribute namespace="##other" processContents="lax"/>
-        </complexType>
-    </element>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-contribution-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-contribution-1.1-cd04.xsd
deleted file mode 100644
index f13fbd1567..0000000000
--- a/cpp/sca/runtime/xsd/sca-contribution-1.1-cd04.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-   <!-- Contribution -->
-   <element name="contribution" type="sca:ContributionType"/>
-   <complexType name="ContributionType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element name="deployable" type="sca:DeployableType" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <element ref="sca:importBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:exportBase" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Deployable -->
-   <complexType name="DeployableType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="composite" type="QName" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Import -->
-   <element name="importBase" type="sca:Import" abstract="true" />
-   <complexType name="Import" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>   
-   </complexType>
-   
-   <element name="import" type="sca:ImportType" 
-            substitutionGroup="sca:importBase"/>
-   <complexType name="ImportType">
-      <complexContent>
-         <extension base="sca:Import">
-            <attribute name="namespace" type="string" use="required"/>
-            <attribute name="location" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Export -->
-   <element name="exportBase" type="sca:Export" abstract="true" />
-   <complexType name="Export" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-         </extension>
-      </complexContent>      
-   </complexType>
-   
-   <element name="export" type="sca:ExportType" 
-            substitutionGroup="sca:exportBase"/>
-   <complexType name="ExportType">
-      <complexContent>
-         <extension base="sca:Export">
-            <attribute name="namespace" type="string" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-contribution-c-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-contribution-c-1.1-cd04.xsd
deleted file mode 100644
index 7e2cd739fd..0000000000
--- a/cpp/sca/runtime/xsd/sca-contribution-c-1.1-cd04.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
-
-	<element name="export.c" type="sca:CExport"
-		substitutionGroup="sca:exportBase" />
-
-	<complexType name="CExport">
-		<complexContent>
-			<extension base="sca:Export">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<element name="import.c" type="sca:CImport"
-		substitutionGroup="sca:importBase" />
-
-	<complexType name="CImport">
-		<complexContent>
-			<extension base="sca:Import">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="location" type="string" use="required" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-contribution-cpp-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-contribution-cpp-1.1-cd04.xsd
deleted file mode 100644
index b808125568..0000000000
--- a/cpp/sca/runtime/xsd/sca-contribution-cpp-1.1-cd04.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-contribution-1.1-cd04.xsd" />
-
-	<element name="export.cpp" type="sca:CPPExport"
-		substitutionGroup="sca:exportBase" />
-
-	<complexType name="CPPExport">
-		<complexContent>
-			<extension base="sca:Export">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<element name="import.cpp" type="sca:CPPImport"
-		substitutionGroup="sca:importBase" />
-
-	<complexType name="CPPImport">
-		<complexContent>
-			<extension base="sca:Import">
-				<attribute name="name" type="QName" use="required" />
-				<attribute name="location" type="string" use="required" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-</schema>
\ No newline at end of file
diff --git a/cpp/sca/runtime/xsd/sca-contribution-java-1.1-cd02.xsd b/cpp/sca/runtime/xsd/sca-contribution-java-1.1-cd02.xsd
deleted file mode 100644
index 1dcd515c98..0000000000
--- a/cpp/sca/runtime/xsd/sca-contribution-java-1.1-cd02.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-contribution-1.1-cd04.xsd"/>
-
-   <!-- Import.java -->   
-   <element name="import.java" type="sca:JavaImportType"
-      substitutionGroup="sca:importBase" />
-   <complexType name="JavaImportType">
-      <complexContent>
-         <extension base="sca:Import">
-            <attribute name="package" type="NCName" use="required"/>
-            <attribute name="location" type="anyURI" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Export.java -->
-   <element name="export.java" type="sca:JavaExportType"
-      substitutionGroup="sca:exportBase" />
-   <complexType name="JavaExportType">
-      <complexContent>
-         <extension base="sca:Export">
-            <attribute name="package" type="NCName" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd
deleted file mode 100644
index 654d568bab..0000000000
--- a/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <import namespace="http://www.w3.org/XML/1998/namespace" 
-           schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-   <!-- Common extension base for SCA definitions -->
-   <complexType name="CommonExtensionBase">
-      <sequence>
-         <element ref="sca:documentation" minOccurs="0" 
-                  maxOccurs="unbounded"/>
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-   
-   <element name="documentation" type="sca:Documentation"/>
-   <complexType name="Documentation" mixed="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded"/>
-      </sequence>
-      <attribute ref="xml:lang"/>
-   </complexType>
-
-   <!-- Component Type -->
-   <element name="componentType" type="sca:ComponentType"/>
-   <complexType name="ComponentType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:implementation" minOccurs="0"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ComponentService"/>
-                  <element name="reference" 
-                     type="sca:ComponentTypeReference"/>
-                  <element name="property" type="sca:Property"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Composite -->
-   <element name="composite" type="sca:Composite"/>
-   <complexType name="Composite">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:include" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:Service"/>
-                  <element name="property" type="sca:Property"/>
-                  <element name="component" type="sca:Component"/>
-                  <element name="reference" type="sca:Reference"/>
-                  <element name="wire" type="sca:Wire"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="targetNamespace" type="anyURI" use="required"/>
-            <attribute name="local" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="autowire" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Contract base type for Service, Reference -->
-   <complexType name="Contract" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:binding" minOccurs="0" 
-                        maxOccurs="unbounded" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional" />
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Service -->
-   <complexType name="Service">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="promote" type="anyURI" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Interface -->
-   <element name="interface" type="sca:Interface" abstract="true"/>
-   <complexType name="Interface" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <attribute name="remotable" type="boolean" use="optional"/>
-	        <attribute name="requires" type="sca:listOfQNames" 
-               use="optional"/>
-	        <attribute name="policySets" type="sca:listOfQNames" 
-               use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Reference -->
-   <complexType name="Reference">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="target" type="sca:listOfAnyURIs" 
-                       use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="promote" type="sca:listOfAnyURIs" 
-                       use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Property -->
-   <complexType name="SCAPropertyBase" mixed="true">
-      <sequence>
-         <any namespace="##any" processContents="lax" minOccurs="0"
-              maxOccurs="unbounded"/>
-         <!-- NOT an extension point; This any exists to accept
-             the element-based or complex type property
-             i.e. no element-based extension point under "sca:property" -->
-      </sequence>
-      <!-- mixed="true" to handle simple type -->
-      <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-      <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-   </complexType>
-   
-   <complexType name="Property" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-         <!-- extension defines the place to hold default value -->
-         <!-- an extension point ; attribute-based only -->
-      </complexContent>
-   </complexType>
-   
-   <!-- ConstrainingProperty is equivalent to the Property type but removes 
-        the capability to contain a value -->
-   <complexType name="ConstrainingProperty" mixed="true">
-      <complexContent mixed="true">
-         <restriction base="sca:Property">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-   <complexType name="PropertyValue" mixed="true">
-      <complexContent mixed="true">
-         <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="source" type="string" use="optional"/>
-            <attribute name="file" type="anyURI" use="optional"/>
-            <attribute name="value" type="string" use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-         <!-- an extension point ; attribute-based only -->
-      </complexContent>
-   </complexType>
-
-   <!-- Binding -->
-   <element name="binding" type="sca:Binding" abstract="true"/>
-   <complexType name="Binding" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:operationSelector" minOccurs="0" 
-                        maxOccurs="1" />
-            </sequence>
-            <attribute name="uri" type="anyURI" use="optional"/>
-            <attribute name="name" type="NCName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Binding Type -->
-   <element name="bindingType" type="sca:BindingType"/>
-   <complexType name="BindingType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="type" type="QName" use="required"/>
-            <attribute name="alwaysProvides" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="mayProvide" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- WireFormat Type -->
-   <element name="wireFormat" type="sca:WireFormatType" abstract="true"/>
-   <complexType name="WireFormatType" abstract="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-
-   <!-- OperationSelector Type -->
-   <element name="operationSelector" type="sca:OperationSelectorType" abstract="true"/>
-   <complexType name="OperationSelectorType" abstract="true">
-      <sequence>
-         <any namespace="##other" processContents="lax" minOccurs="0" 
-              maxOccurs="unbounded" />
-      </sequence>
-      <anyAttribute namespace="##other" processContents="lax"/>
-   </complexType>
-   
-   <!-- Callback -->
-   <element name="callback" type="sca:Callback"/>
-   <complexType name="Callback">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="sca:binding"/>
-               <any namespace="##other" processContents="lax"/>
-            </choice>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Component -->
-   <complexType name="Component">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <element ref="sca:implementation" minOccurs="0"/>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ComponentService"/>
-                  <element name="reference" type="sca:ComponentReference"/>
-                  <element name="property" type="sca:PropertyValue"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Component Service -->
-   <complexType name="ComponentService">
-      <complexContent>
-         <extension base="sca:Contract">
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Constraining Service -->
-   <complexType name="ConstrainingService">
-      <complexContent>
-         <restriction base="sca:ComponentService">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-
-   <!-- Component Reference -->
-   <complexType name="ComponentReference">
-      <complexContent>
-         <extension base="sca:Contract">
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="target" type="sca:listOfAnyURIs" 
-                       use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="nonOverridable" type="boolean" use="optional" 
-                       default="false"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-   <!-- Constraining Reference -->
-   <complexType name="ConstrainingReference">
-      <complexContent>
-         <restriction base="sca:ComponentReference">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-         </restriction>
-      </complexContent>
-   </complexType>   
-   
-   <!-- Component Type Reference -->
-   <complexType name="ComponentTypeReference">
-      <complexContent>
-         <restriction base="sca:ComponentReference">
-            <sequence>
-               <element ref="sca:documentation" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:interface" minOccurs="0"/>
-               <element ref="sca:binding" minOccurs="0" 
-                        maxOccurs="unbounded"/>
-               <element ref="sca:callback" minOccurs="0"/>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-
-   <!-- Implementation -->
-   <element name="implementation" type="sca:Implementation" abstract="true"/>
-   <complexType name="Implementation" abstract="true">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <attribute name="requires" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="policySets" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Implementation Type -->
-   <element name="implementationType" type="sca:ImplementationType"/>
-   <complexType name="ImplementationType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="type" type="QName" use="required"/>
-            <attribute name="alwaysProvides" type="sca:listOfQNames" 
-                       use="optional"/>
-            <attribute name="mayProvide" type="sca:listOfQNames" 
-                       use="optional"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Wire -->
-   <complexType name="Wire">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="source" type="anyURI" use="required"/>
-            <attribute name="target" type="anyURI" use="required"/>
-            <attribute name="replace" type="boolean" use="optional" 
-               default="false"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Include -->
-   <element name="include" type="sca:Include"/>
-   <complexType name="Include">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <attribute name="name" type="QName"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Constraining Type -->
-   <element name="constrainingType" type="sca:ConstrainingType"/>
-   <complexType name="ConstrainingType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ConstrainingService"/>
-                  <element name="reference" 
-                           type="sca:ConstrainingReference"/>
-                  <element name="property" type="sca:ConstrainingProperty"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="targetNamespace" type="anyURI"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <!-- Intents within WSDL documents -->
-   <attribute name="requires" type="sca:listOfQNames"/>
-
-   <!-- Global attribute definition for @callback to mark a WSDL port type    
-        as having a callback interface defined in terms of a second port 
-        type. -->
-   <attribute name="callback" type="anyURI"/>
-   
-   <!-- Value type definition for property values -->
-   <element name="value" type="sca:ValueType"/> 
-   <complexType name="ValueType" mixed="true">
-      <sequence> 
-         <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs='unbounded'/> 
-      </sequence> 
-      <!-- mixed="true" to handle simple type --> 
-      <anyAttribute namespace="##any" processContents="lax"/> 
-   </complexType> 
-   
-   <!-- Miscellaneous simple type definitions -->
-   <simpleType name="Multiplicity">
-      <restriction base="string">
-         <enumeration value="0..1"/>
-         <enumeration value="1..1"/>
-         <enumeration value="0..n"/>
-         <enumeration value="1..n"/>
-      </restriction>
-   </simpleType>
-   
-   <simpleType name="OverrideOptions">
-      <restriction base="string">
-         <enumeration value="no"/>
-         <enumeration value="may"/>
-         <enumeration value="must"/>
-      </restriction>
-   </simpleType>
-   
-   <simpleType name="listOfQNames">
-      <list itemType="QName"/>
-   </simpleType>
-   
-   <simpleType name="listOfAnyURIs">
-      <list itemType="anyURI"/>
-   </simpleType>
-	
-	<simpleType name="CreateResource">
-		<restriction base="string">
-			<enumeration value="always" />
-			<enumeration value="never" />
-			<enumeration value="ifnotexist" />
-		</restriction>
-	</simpleType>
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-definitions-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-definitions-1.1-cd04.xsd
deleted file mode 100644
index 2034e4d2c8..0000000000
--- a/cpp/sca/runtime/xsd/sca-definitions-1.1-cd04.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
-   
-   <!-- Definitions -->
-   <element name="definitions" type="sca:tDefinitions"/>
-   <complexType name="tDefinitions">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="sca:intent"/>
-               <element ref="sca:policySet"/>
-               <element ref="sca:binding"/>
-               <element ref="sca:bindingType"/>
-               <element ref="sca:implementationType"/>
-               <any namespace="##other" processContents="lax" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-            </choice>
-            <attribute name="targetNamespace" type="anyURI" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-implementation-bpel-1.1-cd03.xsd b/cpp/sca/runtime/xsd/sca-implementation-bpel-1.1-cd03.xsd
deleted file mode 100644
index 11239e20d0..0000000000
--- a/cpp/sca/runtime/xsd/sca-implementation-bpel-1.1-cd03.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 

-     OASIS trademark, IPR and other policies apply. -->

-<schema 

-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"

-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-   xmlns="http://www.w3.org/2001/XMLSchema"

-   elementFormDefault="qualified">

-

-   <!-- SCA-Assembly XML Schema -->

-   <include schemaLocation="sca-core-1.1-cd04.xsd" />

-

-   <!-- SCA-BPEL Component Implementation Type -->

-   <element name="implementation.bpel" 

-      type="sca:BPELImplementation" substitutionGroup="sca:implementation" />

-

-   <complexType name="BPELImplementation">

-      <complexContent>

-         <extension base="sca:Implementation">

-            <sequence>

-               <any namespace="##other" processContents="lax"

-                  minOccurs="0" maxOccurs="unbounded" />

-            </sequence>

-            <attribute name="process" type="QName" use="required" />

-            <anyAttribute namespace="##other" processContents="lax" />

-         </extension>

-      </complexContent>

-   </complexType>

-

-</schema>

- 

diff --git a/cpp/sca/runtime/xsd/sca-implementation-c-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-implementation-c-1.1-cd04.xsd
deleted file mode 100644
index 011c7a61ea..0000000000
--- a/cpp/sca/runtime/xsd/sca-implementation-c-1.1-cd04.xsd
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
-
-	<element name="implementation.c" type="sca:CImplementation"
-		substitutionGroup="sca:implementation" />
-
-	<complexType name="CImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<element name="operation"
-						type="sca:CImplementationFunction" minOccurs="0"
-						maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="module" type="NCName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-				<attribute name="library" type="boolean" use="optional" />
-				<attribute name="componentType" type="string" use="required" />
-				<attribute name="scope" type="sca:CImplementationScope"
-					use="optional" />
-				<attribute name="eagerInit" type="boolean"
-					use="optional" />
-				<attribute name="init" type="boolean" use="optional" />
-				<attribute name="destoy" type="boolean" use="optional" />
-				<attribute name="allowsPassByReference" type="boolean"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<simpleType name="CImplementationScope">
-		<restriction base="string">
-			<enumeration value="stateless" />
-			<enumeration value="composite" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="CImplementationFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="allowsPassByReference" type="boolean"
-			use="optional" />
-		<attribute name="init" type="boolean" use="optional" />
-		<attribute name="destoy" type="boolean" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-implementation-composite-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-implementation-composite-1.1-cd04.xsd
deleted file mode 100644
index e0524ee006..0000000000
--- a/cpp/sca/runtime/xsd/sca-implementation-composite-1.1-cd04.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-   <!-- Composite Implementation -->
-   <element name="implementation.composite" type="sca:SCAImplementation" 
-            substitutionGroup="sca:implementation"/>
-   <complexType name="SCAImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="QName" use="required"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-implementation-cpp-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-implementation-cpp-1.1-cd04.xsd
deleted file mode 100644
index 777da1e8ab..0000000000
--- a/cpp/sca/runtime/xsd/sca-implementation-cpp-1.1-cd04.xsd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
-
-	<element name="implementation.cpp" type="sca:CPPImplementation"
-		substitutionGroup="sca:implementation" />
-	<complexType name="CPPImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<element name="function"
-						type="sca:CPPImplementationFunction" minOccurs="0"
-						maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="library" type="NCName" use="required" />
-				<attribute name="header" type="NCName" use="required" />
-				<attribute name="path" type="string" use="optional" />
-				<attribute name="class" type="Name" use="optional" />
-				<attribute name="componentType" type="string"
-					use="optional" />
-				<attribute name="scope"
-					type="sca:CPPImplementationScope" use="optional" />
-				<attribute name="eagerInit" type="boolean"
-					use="optional" />
-				<attribute name="allowsPassByReference" type="boolean"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<simpleType name="CPPImplementationScope">
-		<restriction base="string">
-			<enumeration value="stateless" />
-			<enumeration value="composite" />
-		</restriction>
-	</simpleType>
-
-	<complexType name="CPPImplementationFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="allowsPassByReference" type="boolean"
-			use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-implementation-java-1.1-cd03.xsd b/cpp/sca/runtime/xsd/sca-implementation-java-1.1-cd03.xsd
deleted file mode 100644
index 53f6a0a51a..0000000000
--- a/cpp/sca/runtime/xsd/sca-implementation-java-1.1-cd03.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-
-   <!-- Java Implementation -->
-   <element name="implementation.java" type="sca:JavaImplementation" 
-            substitutionGroup="sca:implementation"/>
-   <complexType name="JavaImplementation">
-      <complexContent>
-         <extension base="sca:Implementation">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="class" type="NCName" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-implementation-spring-1.1-cd01.xsd b/cpp/sca/runtime/xsd/sca-implementation-spring-1.1-cd01.xsd
deleted file mode 100644
index 51327ec84e..0000000000
--- a/cpp/sca/runtime/xsd/sca-implementation-spring-1.1-cd01.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"  
-  xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-  elementFormDefault="qualified"
-  targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">  
-	
-	<include schemaLocation="sca-core-1.1-cd04.xsd"/>
-	<element name="implementation.spring" type="sca:SpringImplementation" substitutionGroup="sca:implementation"/>
-	<complexType name="SpringImplementation">
-		<complexContent>
-			<extension base="sca:Implementation">
-				<sequence>
-					<any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-				<attribute name="location" type="anyURI" use="required"/>
-			</extension>
-		</complexContent>
-	</complexType>
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-interface-c-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-interface-c-1.1-cd04.xsd
deleted file mode 100644
index 045118cb43..0000000000
--- a/cpp/sca/runtime/xsd/sca-interface-c-1.1-cd04.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2007,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
-
-	<element name="interface.c" type="sca:CInterface"
-		substitutionGroup="sca:interface" />
-
-	<complexType name="CInterface">
-		<complexContent>
-			<extension base="sca:Interface">
-				<sequence>
-					<element name="function" type="sca:CFunction"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="callbackFunction"
-						type="sca:CFunction" minOccurs="0" maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="header" type="string" use="required" />
-				<attribute name="callbackHeader" type="string"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="CFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="requires" type="sca:listOfQNames"
-			use="optional" />
-		<attribute name="oneWay" type="boolean" use="optional" />
-		<attribute name="input" type="NCName" use="optional" />
-		<attribute name="output" type="NCName" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-interface-cpp-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-interface-cpp-1.1-cd04.xsd
deleted file mode 100644
index 536b592c04..0000000000
--- a/cpp/sca/runtime/xsd/sca-interface-cpp-1.1-cd04.xsd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
-
-	<element name="interface.cpp" type="sca:CPPInterface"
-		substitutionGroup="sca:interface" />
-
-	<complexType name="CPPInterface">
-		<complexContent>
-			<extension base="sca:Interface">
-				<sequence>
-					<element name="function" type="sca:CPPFunction"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="callbackFunction"
-						type="sca:CPPFunction" minOccurs="0" maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</sequence>
-				<attribute name="header" type="string" use="required" />
-				<attribute name="class" type="Name" use="required" />
-				<attribute name="callbackHeader" type="string"
-					use="optional" />
-				<attribute name="callbackClass" type="Name"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="CPPFunction">
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="requires" type="sca:listOfQNames"
-			use="optional" />
-		<attribute name="oneWay" type="boolean" use="optional" />
-		<anyAttribute namespace="##other" processContents="lax" />
-	</complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-interface-java-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-interface-java-1.1-cd04.xsd
deleted file mode 100644
index faf6d1cfb1..0000000000
--- a/cpp/sca/runtime/xsd/sca-interface-java-1.1-cd04.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-   
-   <!-- Java Interface -->
-   <element name="interface.java" type="sca:JavaInterface" 
-            substitutionGroup="sca:interface"/>
-   <complexType name="JavaInterface">
-      <complexContent>
-         <extension base="sca:Interface">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="interface" type="NCName" use="required"/>
-            <attribute name="callbackInterface" type="NCName" 
-                       use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-interface-wsdl-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-interface-wsdl-1.1-cd04.xsd
deleted file mode 100644
index 980e4f90f5..0000000000
--- a/cpp/sca/runtime/xsd/sca-interface-wsdl-1.1-cd04.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-   elementFormDefault="qualified">
-   
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-   
-   <!-- WSDL Interface -->
-   <element name="interface.wsdl" type="sca:WSDLPortType" 
-            substitutionGroup="sca:interface"/>
-   <complexType name="WSDLPortType">
-      <complexContent>
-         <extension base="sca:Interface">
-            <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="interface" type="anyURI" use="required"/>
-            <attribute name="callbackInterface" type="anyURI" 
-                       use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </extension>
-      </complexContent>
-   </complexType>
-   
-</schema>
diff --git a/cpp/sca/runtime/xsd/sca-jee-1.1-wd03.xsd b/cpp/sca/runtime/xsd/sca-jee-1.1-wd03.xsd
deleted file mode 100644
index 6df685b881..0000000000
--- a/cpp/sca/runtime/xsd/sca-jee-1.1-wd03.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. OASIS trademark, IPR and other policies apply.  -->

-<schema xmlns="http://www.w3.org/2001/XMLSchema" 

-   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

-   elementFormDefault="qualified">

-

-	<include schemaLocation="sca-core-1.1-cd04.xsd"/>

-

-	<element name="implementation.ejb" type="sca:EJBImplementation" 

-      substitutionGroup="sca:implementation"/>

-	<complexType name="EJBImplementation">

-	   <complexContent>

-	      <extension base="sca:Implementation">

-	         <sequence>

-               <any namespace="##other" processContents="lax" minOccurs="0" 

-                  maxOccurs="unbounded"/>

-            </sequence>

-            <attribute name="ejb-link" type="string" use="required"/>

-            <anyAttribute namespace="##other" processContents="lax"/>

-        </extension>

-      </complexContent>

-	</complexType>

-	<element name="implementation.web" type="sca:WebImplementation" 

-      substitutionGroup="sca:implementation"/>

-	<complexType name="WebImplementation">

-	   <complexContent>

-	      <extension base="sca:Implementation">

-            <sequence>

-               <any namespace="##other" processContents="lax" minOccurs="0" 

-                  maxOccurs="unbounded"/>

-            </sequence>

-            <attribute name="web-uri" type="string" use="required"/>

-            <anyAttribute namespace="##other" processContents="lax"/>

-         </extension>

-      </complexContent>

-	</complexType>

-	<element name="implementation.jee" type="sca:JEEImplementation" 

-      substitutionGroup="sca:implementation"/>

-	<complexType name="JEEImplementation">

-      <complexContent>

-         <extension base="sca:Implementation">

-            <sequence>

-               <any namespace="##other" processContents="lax" minOccurs="0" 

-                  maxOccurs="unbounded"/>

-            </sequence>

-            <attribute name="archive" type="string" use="required"/>

-            <anyAttribute namespace="##other" processContents="lax"/>

-         </extension>

-      </complexContent>

-	</complexType>

-</schema>

diff --git a/cpp/sca/runtime/xsd/sca-policy-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-policy-1.1-cd04.xsd
deleted file mode 100644
index a6cdfb2be5..0000000000
--- a/cpp/sca/runtime/xsd/sca-policy-1.1-cd04.xsd
+++ /dev/null
@@ -1,101 +0,0 @@
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-	elementFormDefault="qualified">
-
-	<include schemaLocation="sca-core-1.1-cd04.xsd"/>	
-	<import namespace="http://www.w3.org/ns/ws-policy"
-		schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
-
-	<element name="intent" type="sca:Intent"/>
-	<complexType name="Intent">
-		<sequence>
-			<element name="description" type="string" minOccurs="0"
-			   maxOccurs="1" />
-			<element name="qualifier" type="sca:IntentQualifier" 
-			   minOccurs="0" maxOccurs="unbounded" />
-			<any namespace="##other" processContents="lax" 
-			   minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="constrains" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="requires" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="excludes" type="sca:listOfQNames" 
-		   use="optional"/>
-		<attribute name="mutuallyExclusive" type="boolean" 
-		   use="optional" default="false"/>
-		<attribute name="intentType" 
-			type="sca:InteractionOrImplementation" 
-			use="optional" default="interaction"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="IntentQualifier">
-		<sequence>
-			<element name="description" type="string" minOccurs="0" 
-			   maxOccurs="1" />
-		</sequence>
-  		<attribute name="name" type="NCName" use="required"/>
-  		<attribute name="default" type="boolean" use="optional" 
-  		   default="false"/>
-	</complexType>
-
-	<element name="policySet" type="sca:PolicySet"/>
-	<complexType name="PolicySet">
-		<choice minOccurs="0" maxOccurs="unbounded">
-  			<element name="policySetReference" 
-  			   type="sca:PolicySetReference"/>
-  			<element name="intentMap" type="sca:IntentMap"/>
-  			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="NCName" use="required"/>
-		<attribute name="provides" type="sca:listOfQNames"/>
-		<attribute name="appliesTo" type="string" use="optional"/>
-		<attribute name="attachTo" type="string" use="optional"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<element name="policySetAttachment" 
-	   type="sca:PolicySetAttachment"/>
-	<complexType name="PolicySetAttachment">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="IntentMap">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="qualifier" type="sca:Qualifier"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="provides" type="QName" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<complexType name="Qualifier">
-		<sequence minOccurs="0" maxOccurs="unbounded">
-			<any namespace="##other" processContents="lax"/>
-		</sequence>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
-
-	<simpleType name="listOfNCNames">
-		<list itemType="NCName"/>
-	</simpleType>
-
-	<simpleType name="InteractionOrImplementation">
-		<restriction base="string">
-			<enumeration value="interaction"/>
-			<enumeration value="implementation"/>
-		</restriction>
-	</simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/cpp/sca/runtime/xsd/sca-policy-1.1-intents-definitions-cd02.xml b/cpp/sca/runtime/xsd/sca-policy-1.1-intents-definitions-cd02.xml
deleted file mode 100644
index 8efde2653f..0000000000
--- a/cpp/sca/runtime/xsd/sca-policy-1.1-intents-definitions-cd02.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
-     OASIS trademark, IPR and other policies apply.  -->
-<definitions xmlns:xml="http://www.w3.org/XML/1998/namespace" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903">
-                 
-	<!-- Security related intents -->                 
-	<intent name="serverAuthentication" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding requires that the 
-			server is authenticated by the client
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent>
-
-	<intent name="clientAuthentication" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding requires that the 
-			client is authenticated by the server
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent>
-
-	<intent name="authentication" requires="clientAuthentication">
-		<description>
-			A convenience intent to help migration
-		</description>
-	</intent>
-
-	<intent name="mutualAuthentication"
-		requires="clientAuthentication serverAuthentication">
-		<description>
-			Communication through the binding requires that the
-			client and server to authenticate each other
-		</description>
-	</intent>
-
-	<intent name="confidentiality" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding prevents unauthorized 
-			users from reading the messages
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>	
-	</intent>
-
-	<intent name="integrity" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			Communication through the binding prevents tampering 
-			with the messages sent between the client and the service.
-		</description>
-		<qualifier name="transport" default="true"/>
-		<qualifier name="message"/>
-	</intent> 
-
-	<intent name="authorization" constrains="sca:implementation" 
-	    intentType="implementation">
-		<description>
-			Ensures clients are authorized to use services. 
-		</description>
-		<qualifier name="fineGrain" default="true"/>
-	</intent>
-
-	
-	<!-- Reliable messaging related intents -->    
-	<intent name="atLeastOnce" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			This intent is used to indicate that a message sent
-			by a client is always delivered to the component.
-		</description>
-	</intent>
-
-	<intent name="atMostOnce" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			This intent is used to indicate that a message that was 
-			successfully sent by a client is not delivered more than 
-			once to the component.
-		</description>
-	</intent>
-
-	<intent name="exactlyOnce" requires="atLeastOnce atMostOnce" 
-	    constrains="sca:binding" intentType="interaction">
-		<description>
-			This profile intent is used to indicate that a message sent 
-			by a client is always delivered to the component. It also 
-			indicates that duplicate messages are not delivered to the 
-			component.
-	    </description>
-	</intent>	           
-
-	<intent name="ordered" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-			This intent is used to indicate that all the messages are 
-			delivered to the component in the order they were sent by 
-			the client.
-		</description>
-	</intent>
-	
-	<!-- Transaction related intents -->
-	<intent name="managedTransaction" excludes="sca:noManagedTransaction" 
-	    mutuallyExclusive="true" constrains="sca:implementation" 
-	    intentType="implementation">
-		<description>
-		A managed transaction environment is necessary in order to 
-		run the component. The specific type of managed transaction 
-		needed is not constrained.
-		</description>
-		<qualifier name="global" default="true">
-			<description>
-			For a component marked with managedTransaction.global 
-			a global transaction needs to be present before dispatching 
-			any method on the component - using any transaction 
-			propagated from the client or else beginning and completing 
-			a new transaction. 
-			</description>
-		</qualifier>
-		<qualifier name="local">
-			<description>
-			A component marked with managedTransaction.local needs to 
-			run within a local transaction containment (LTC) that 
-			is started and ended by the SCA runtime.
-			</description>
-		</qualifier>		
-	</intent>
-
-	<intent name="noManagedTransaction" excludes="sca:managedTransaction" 
-	    constrains="sca:implementation" intentType="implementation">
-		<description>
-		A component marked with noManagedTransaction needs to run without 
-		a managed transaction, under neither a global transaction nor 
-		an LTC. A transaction propagated to the hosting SCA runtime 
-		is not joined by the hosting runtime on behalf of a 
-		component marked with noManagedtransaction.
-		</description>
-	</intent>
-
-	<intent name="transactedOneWay" excludes="sca:immediateOneWay" 
-	    constrains="sca:binding" intentType="implementation">
-		<description>
-		For a reference marked as transactedOneWay any OneWay invocation 
-		messages are transacted as part of a client global 
-		transaction.
-		For a service marked as transactedOneWay any OneWay invocation 
-		message are received from the transport binding in a 
-		transacted fashion, under the service’s global transaction.
-		</description>
-	</intent>
-
-	<intent name="immediateOneWay" excludes="transactedOneWay" 
-	    constrains="sca:binding" intentType="implementation">
-		<description>
-		For a reference indicates that any OneWay invocation messages 
-		are sent immediately regardless of any client transaction.
-		For a service indicates that any OneWay invocation is 
-		received immediately regardless of any target service 
-		transaction.
-		</description>
-	</intent>
-
-	<intent name="propagatesTransaction" excludes="suspendsTransaction" 
-	    constrains="sca:binding" intentType="interaction">
-		<description>
-		A service marked with propagatesTransaction is dispatched 
-		under any propagated (client) transaction and the service binding 
-		needs to be capable	of receiving a transaction context.
-		A reference marked with propagatesTransaction propagates any 
-		transaction context under which the client runs when the 
-		reference is used for a request-response interaction and the 
-		binding of a reference marked with propagatesTransaction needs to
-		be capable of propagating a transaction context. 
-		</description>
-	</intent>
-
-	<intent name="suspendsTransaction" excludes="propagatesTransaction" 
-	    constrains="sca:binding" intentType="interaction">
-		<description>
-		A service marked with suspendsTransaction is not dispatched 
-		under any propagated (client) transaction.
-		A reference marked with suspendsTransaction does not propagate 
-		any transaction context under which the client runs when the 
-		reference is used.
-		</description>
-	</intent>
-	
-	<intent name="managedSharedTransaction" 
-		requires="managedTransaction.global propagatesTransaction">
-		<description>
-			Used to indicate that the component requires both the 
-			managedTransaction.global and the propagatesTransactions 
-			intents
-		</description>
-	</intent>
-	
-	<!-- Miscellaneous intents -->	
-	<intent name="asyncInvocation" constrains="sca:binding" 
-		intentType="interaction">
-		<description>
-			Indicates that request/response operations for the 
-			interface of this wire are "long running" and must be
-			treated as two separate message transmissions
-		</description>
-	</intent>
-	
-	<intent name="SOAP" constrains="sca:binding" intentType="interaction" mutuallyExclusive="true">
-		<description>
-		Specifies that the SOAP messaging model is used for delivering 
-		messages.
-		</description>
-		<qualifier name="V1_1" default="true"/>
-		<qualifier name="V1_2"/>
-	</intent>	
-
-	<intent name="JMS" constrains="sca:binding" intentType="interaction">
-		<description>
-		Requires that the messages are delivered and received via the 
-		JMS API.
-		</description>
-	</intent>
-
-	<intent name="noListener" constrains="sca:binding" 
-	    intentType="interaction">
-		<description>
-		This intent can only be used on a reference. Indicates that the 
-		client is not able to handle new inbound connections. The binding 
-		and callback binding are configured so that any 
-		response or callback comes either through a back channel of the 
-		connection from the client to the server or by having the client 
-		poll the server for messages. 
-		</description>
-	</intent>	
-	
-</definitions>
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-dwr.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-dwr.xsd
deleted file mode 100644
index de7bc6bdd0..0000000000
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-dwr.xsd
+++ /dev/null
@@ -1,41 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
-
-    <element name="binding.dwr" type="t:DWRBinding"/>
-    
-    <complexType name="DWRBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-http.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-http.xsd
deleted file mode 100644
index ce8d47b575..0000000000
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-http.xsd
+++ /dev/null
@@ -1,41 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
-
-    <element name="binding.http" type="t:HTTPBinding"/>
-    
-    <complexType name="HTTPBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
deleted file mode 100644
index 92142d117d..0000000000
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ /dev/null
@@ -1,41 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
-
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
-    
-    <complexType name="JSONRPCBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-rmi.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-rmi.xsd
deleted file mode 100644
index 9b15010624..0000000000
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-rmi.xsd
+++ /dev/null
@@ -1,40 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
-
-    <element name="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-osgi.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-osgi.xsd
deleted file mode 100644
index dfe819d97f..0000000000
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-osgi.xsd
+++ /dev/null
@@ -1,53 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
-
-    <element name="implementation.osgi" type="t:OSGiImplementation" substitutionGroup="sca:implementation"/>
-
-    <complexType name="OSGiImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax"
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="bundleSymbolicName" type="string" use="required"/>
-                <attribute name="bundleVersion" type="string" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-   <element name="osgi.property" type="t:OSGiProperty"/>
-   <complexType name="OSGiProperty">
-      <simpleContent>
-        <extension base="string">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="value" type="string" use="optional"/>
-        </extension>
-      </simpleContent>
-   </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd
deleted file mode 100644
index 8e65b402d7..0000000000
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd
+++ /dev/null
@@ -1,43 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
-
-    <element name="implementation.widget" type="t:WidgetImplementation" substitutionGroup="sca:implementation"/>
-    	
-    <complexType name="WidgetImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd
deleted file mode 100644
index fb0a0cf9d5..0000000000
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd
+++ /dev/null
@@ -1,35 +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.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1">
-
-<!--
-    <import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/>
--->
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/>
-
-    <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/>
-
-    <include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-implementation-widget.xsd"/>
-</schema>