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

64 files changed, 53 insertions, 31 deletions

diff --git a/cpp/sca/Makefile.am b/cpp/sca/Makefile.am
index c13c3b5428..106fa5e25b 100644
--- a/cpp/sca/Makefile.am
+++ b/cpp/sca/Makefile.am
@@ -15,12 +15,12 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-SUBDIRS = runtime doc
+SUBDIRS = runtime kernel modules doc
 DIST_SUBDIRS = runtime doc samples
 datadir=$(prefix)
-
 data_DATA = INSTALL README LICENSE COPYING NOTICE GettingStarted.html
-EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE autogen.sh build.sh builddist.sh configure.sh makebindist.sh GettingStarted.html
+nobase_data_DATA = xsd/*.*
+EXTRA_DIST = LICENSE COPYING INSTALL README NOTICE autogen.sh build.sh builddist.sh configure.sh makebindist.sh GettingStarted.html xsd
 
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
diff --git a/cpp/sca/configure.ac b/cpp/sca/configure.ac
index 7cb2e76a50..0bac946b68 100644
--- a/cpp/sca/configure.ac
+++ b/cpp/sca/configure.ac
@@ -290,6 +290,9 @@ AC_CONFIG_FILES([Makefile
                  runtime/extensions/ruby/Makefile
                  runtime/extensions/ruby/src/Makefile
                  runtime/extensions/ruby/extension/Makefile
+                 kernel/Makefile
+                 modules/Makefile
+                 modules/eval/Makefile
                  doc/Makefile
                  doc/Doxyfile
                  ])
diff --git a/cpp/sca/etc/git-exclude b/cpp/sca/etc/git-exclude
index 96b4d901b0..a6e5b24dd4 100644
--- a/cpp/sca/etc/git-exclude
+++ b/cpp/sca/etc/git-exclude
@@ -61,6 +61,6 @@ account_client
 calculator_client
 store-test
 store2-test
-core-test
+kernel-test
 xml-test
 
diff --git a/cpp/sca/kernel/Makefile.am b/cpp/sca/kernel/Makefile.am
new file mode 100644
index 0000000000..0055ae687f
--- /dev/null
+++ b/cpp/sca/kernel/Makefile.am
@@ -0,0 +1,29 @@
+#  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.
+
+noinst_PROGRAMS = kernel-test xml-test
+
+nobase_include_HEADERS = *.hpp
+
+INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE}
+
+kernel_test_SOURCES = kernel-test.cpp
+kernel_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2
+
+xml_test_SOURCES = xml-test.cpp
+xml_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2
+
diff --git a/cpp/sca/runtime/core/src/tuscany/function.hpp b/cpp/sca/kernel/function.hpp
index caba5211b9..caba5211b9 100644
--- a/cpp/sca/runtime/core/src/tuscany/function.hpp
+++ b/cpp/sca/kernel/function.hpp
diff --git a/cpp/sca/runtime/core/src/tuscany/gc.hpp b/cpp/sca/kernel/gc.hpp
index b0ed42a474..b0ed42a474 100644
--- a/cpp/sca/runtime/core/src/tuscany/gc.hpp
+++ b/cpp/sca/kernel/gc.hpp
diff --git a/cpp/sca/runtime/core/test/tuscany/core-test.cpp b/cpp/sca/kernel/kernel-test.cpp
index a0b32fa576..3e2793f070 100644
--- a/cpp/sca/runtime/core/test/tuscany/core-test.cpp
+++ b/cpp/sca/kernel/kernel-test.cpp
@@ -29,11 +29,11 @@
 #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"
+#include "function.hpp"
+#include "list.hpp"
+#include "parallel.hpp"
+#include "value.hpp"
+#include "xml.hpp"
 
 namespace tuscany {
 
diff --git a/cpp/sca/runtime/core/src/tuscany/list.hpp b/cpp/sca/kernel/list.hpp
index ef493b19ca..ef493b19ca 100644
--- a/cpp/sca/runtime/core/src/tuscany/list.hpp
+++ b/cpp/sca/kernel/list.hpp
diff --git a/cpp/sca/runtime/core/src/tuscany/parallel.hpp b/cpp/sca/kernel/parallel.hpp
index c0d578e281..c0d578e281 100644
--- a/cpp/sca/runtime/core/src/tuscany/parallel.hpp
+++ b/cpp/sca/kernel/parallel.hpp
diff --git a/cpp/sca/runtime/core/src/tuscany/value.hpp b/cpp/sca/kernel/value.hpp
index ca4bd06ca6..ca4bd06ca6 100644
--- a/cpp/sca/runtime/core/src/tuscany/value.hpp
+++ b/cpp/sca/kernel/value.hpp
diff --git a/cpp/sca/runtime/core/test/tuscany/xml-test.cpp b/cpp/sca/kernel/xml-test.cpp
index 818c03ba68..818c03ba68 100644
--- a/cpp/sca/runtime/core/test/tuscany/xml-test.cpp
+++ b/cpp/sca/kernel/xml-test.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/xml.hpp b/cpp/sca/kernel/xml.hpp
index b4a3b87ad1..b4a3b87ad1 100644
--- a/cpp/sca/runtime/core/src/tuscany/xml.hpp
+++ b/cpp/sca/kernel/xml.hpp
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/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/samples/store/Makefile.am b/cpp/sca/samples/store/Makefile.am
index 01f90d4a4a..05a0e4482a 100644
--- a/cpp/sca/samples/store/Makefile.am
+++ b/cpp/sca/samples/store/Makefile.am
@@ -21,7 +21,7 @@ storedir=$(prefix)/store/deploy
 store_test_SOURCES = store-test.cpp
 
 INCLUDES = -I. -I${TUSCANY_SCACPP}/include
-store_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca
+store_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca -L${LIBXML2_LIB} -lxml2
 	
 EXTRA_DIST = *.composite
 store_DATA = *.composite
diff --git a/cpp/sca/samples/store/cart.hpp b/cpp/sca/samples/store/cart.hpp
index fe0aa0d81f..fc6155aa25 100644
--- a/cpp/sca/samples/store/cart.hpp
+++ b/cpp/sca/samples/store/cart.hpp
@@ -23,8 +23,8 @@
 #define store_cart_hpp
 
 #include <string>
-#include "tuscany/function.hpp"
-#include "tuscany/list.hpp"
+#include "function.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "item.hpp"
 #include "catalog.hpp"
diff --git a/cpp/sca/samples/store/catalog.hpp b/cpp/sca/samples/store/catalog.hpp
index da63ab593a..6909911c07 100644
--- a/cpp/sca/samples/store/catalog.hpp
+++ b/cpp/sca/samples/store/catalog.hpp
@@ -23,7 +23,7 @@
 #define store_catalog_hpp
 
 #include <string>
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "item.hpp"
 
diff --git a/cpp/sca/samples/store/store-composite.hpp b/cpp/sca/samples/store/store-composite.hpp
index 1d5c993c3f..8cee5a943f 100644
--- a/cpp/sca/samples/store/store-composite.hpp
+++ b/cpp/sca/samples/store/store-composite.hpp
@@ -22,7 +22,7 @@
 #ifndef store_storecomposite_hpp
 #define store_storecomposite_hpp
 
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "currency-composite.hpp"
 #include "item.hpp"
diff --git a/cpp/sca/samples/store/store-solution.hpp b/cpp/sca/samples/store/store-solution.hpp
index 73ddccafbe..ecabb18f1c 100644
--- a/cpp/sca/samples/store/store-solution.hpp
+++ b/cpp/sca/samples/store/store-solution.hpp
@@ -22,7 +22,7 @@
 #ifndef store_storesolution_hpp
 #define store_storesolution_hpp
 
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "store-composite.hpp"
 #include "currency-composite.hpp"
 
diff --git a/cpp/sca/samples/store/store-ui.hpp b/cpp/sca/samples/store/store-ui.hpp
index 3dea169cae..c9d0f4330b 100644
--- a/cpp/sca/samples/store/store-ui.hpp
+++ b/cpp/sca/samples/store/store-ui.hpp
@@ -22,7 +22,7 @@
 #ifndef store_storeui_hpp
 #define store_storeui_hpp
 
-#include "tuscany/list.hpp"
+#include "list.hpp"
 #include "currency.hpp"
 #include "item.hpp"
 #include "catalog.hpp"
diff --git a/cpp/sca/samples/store2/Makefile.am b/cpp/sca/samples/store2/Makefile.am
index a729335093..f7af244044 100644
--- a/cpp/sca/samples/store2/Makefile.am
+++ b/cpp/sca/samples/store2/Makefile.am
@@ -21,7 +21,7 @@ store2dir=$(prefix)/store2/deploy
 store2_test_SOURCES = store2-test.cpp
 
 INCLUDES = -I. -I${TUSCANY_SCACPP}/include
-store2_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca
+store2_test_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca -L${LIBXML2_LIB} -lxml2
 	
 EXTRA_DIST = *.composite
 store2_DATA = *.composite
diff --git a/cpp/sca/samples/store2/service.hpp b/cpp/sca/samples/store2/service.hpp
index 9cf8abdb52..b764e87d1a 100644
--- a/cpp/sca/samples/store2/service.hpp
+++ b/cpp/sca/samples/store2/service.hpp
@@ -22,9 +22,9 @@
 #ifndef tuscany_service_hpp
 #define tuscany_service_hpp
 
-#include "tuscany/function.hpp"
-#include "tuscany/list.hpp"
-#include "tuscany/value.hpp"
+#include "function.hpp"
+#include "list.hpp"
+#include "value.hpp"
 
 namespace store
 {
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
index e8e8f7625a..e8e8f7625a 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
index 685e89a57e..685e89a57e 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
index 641798b17f..641798b17f 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
index f8d74e9c6e..f8d74e9c6e 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
index f6fc9c53b0..f6fc9c53b0 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
index c43e5814ed..c43e5814ed 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
index 24e0b5a975..24e0b5a975 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
index ac4b0ec8e6..ac4b0ec8e6 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xml.xsd
diff --git a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
index 16c791e533..16c791e533 100644
--- a/cpp/sca/runtime/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ b/cpp/sca/xsd/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
diff --git a/cpp/sca/runtime/xsd/sca-1.1-cd04.xsd b/cpp/sca/xsd/sca-1.1-cd04.xsd
index de4620f460..de4620f460 100644
--- a/cpp/sca/runtime/xsd/sca-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-binding-jca-1.1-cd04.xsd b/cpp/sca/xsd/sca-binding-jca-1.1-cd04.xsd
index 7f9baac45c..7f9baac45c 100644
--- a/cpp/sca/runtime/xsd/sca-binding-jca-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-binding-jca-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-binding-jms-1.1-cd04.xsd b/cpp/sca/xsd/sca-binding-jms-1.1-cd04.xsd
index e16039a0cd..e16039a0cd 100644
--- a/cpp/sca/runtime/xsd/sca-binding-jms-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-binding-jms-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-binding-sca-1.1-cd04.xsd b/cpp/sca/xsd/sca-binding-sca-1.1-cd04.xsd
index 897e869806..897e869806 100644
--- a/cpp/sca/runtime/xsd/sca-binding-sca-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-binding-sca-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-binding-ws-1.1-cd04.xsd b/cpp/sca/xsd/sca-binding-ws-1.1-cd04.xsd
index 24198c943d..24198c943d 100644
--- a/cpp/sca/runtime/xsd/sca-binding-ws-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-binding-ws-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-binding-ws-callback-1.1-cd04.xsd b/cpp/sca/xsd/sca-binding-ws-callback-1.1-cd04.xsd
index 4bc2e73d4c..4bc2e73d4c 100644
--- a/cpp/sca/runtime/xsd/sca-binding-ws-callback-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-binding-ws-callback-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-contribution-1.1-cd04.xsd b/cpp/sca/xsd/sca-contribution-1.1-cd04.xsd
index f13fbd1567..f13fbd1567 100644
--- a/cpp/sca/runtime/xsd/sca-contribution-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-contribution-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-contribution-c-1.1-cd04.xsd b/cpp/sca/xsd/sca-contribution-c-1.1-cd04.xsd
index 7e2cd739fd..7e2cd739fd 100644
--- a/cpp/sca/runtime/xsd/sca-contribution-c-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-contribution-c-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-contribution-cpp-1.1-cd04.xsd b/cpp/sca/xsd/sca-contribution-cpp-1.1-cd04.xsd
index b808125568..b808125568 100644
--- a/cpp/sca/runtime/xsd/sca-contribution-cpp-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-contribution-cpp-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-contribution-java-1.1-cd02.xsd b/cpp/sca/xsd/sca-contribution-java-1.1-cd02.xsd
index 1dcd515c98..1dcd515c98 100644
--- a/cpp/sca/runtime/xsd/sca-contribution-java-1.1-cd02.xsd
+++ b/cpp/sca/xsd/sca-contribution-java-1.1-cd02.xsd
diff --git a/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd b/cpp/sca/xsd/sca-core-1.1-cd04.xsd
index 654d568bab..654d568bab 100644
--- a/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-core-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-definitions-1.1-cd04.xsd b/cpp/sca/xsd/sca-definitions-1.1-cd04.xsd
index 2034e4d2c8..2034e4d2c8 100644
--- a/cpp/sca/runtime/xsd/sca-definitions-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-definitions-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-implementation-bpel-1.1-cd03.xsd b/cpp/sca/xsd/sca-implementation-bpel-1.1-cd03.xsd
index 11239e20d0..11239e20d0 100644
--- a/cpp/sca/runtime/xsd/sca-implementation-bpel-1.1-cd03.xsd
+++ b/cpp/sca/xsd/sca-implementation-bpel-1.1-cd03.xsd
diff --git a/cpp/sca/runtime/xsd/sca-implementation-c-1.1-cd04.xsd b/cpp/sca/xsd/sca-implementation-c-1.1-cd04.xsd
index 011c7a61ea..011c7a61ea 100644
--- a/cpp/sca/runtime/xsd/sca-implementation-c-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-implementation-c-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-implementation-composite-1.1-cd04.xsd b/cpp/sca/xsd/sca-implementation-composite-1.1-cd04.xsd
index e0524ee006..e0524ee006 100644
--- a/cpp/sca/runtime/xsd/sca-implementation-composite-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-implementation-composite-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-implementation-cpp-1.1-cd04.xsd b/cpp/sca/xsd/sca-implementation-cpp-1.1-cd04.xsd
index 777da1e8ab..777da1e8ab 100644
--- a/cpp/sca/runtime/xsd/sca-implementation-cpp-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-implementation-cpp-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-implementation-java-1.1-cd03.xsd b/cpp/sca/xsd/sca-implementation-java-1.1-cd03.xsd
index 53f6a0a51a..53f6a0a51a 100644
--- a/cpp/sca/runtime/xsd/sca-implementation-java-1.1-cd03.xsd
+++ b/cpp/sca/xsd/sca-implementation-java-1.1-cd03.xsd
diff --git a/cpp/sca/runtime/xsd/sca-implementation-spring-1.1-cd01.xsd b/cpp/sca/xsd/sca-implementation-spring-1.1-cd01.xsd
index 51327ec84e..51327ec84e 100644
--- a/cpp/sca/runtime/xsd/sca-implementation-spring-1.1-cd01.xsd
+++ b/cpp/sca/xsd/sca-implementation-spring-1.1-cd01.xsd
diff --git a/cpp/sca/runtime/xsd/sca-interface-c-1.1-cd04.xsd b/cpp/sca/xsd/sca-interface-c-1.1-cd04.xsd
index 045118cb43..045118cb43 100644
--- a/cpp/sca/runtime/xsd/sca-interface-c-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-interface-c-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-interface-cpp-1.1-cd04.xsd b/cpp/sca/xsd/sca-interface-cpp-1.1-cd04.xsd
index 536b592c04..536b592c04 100644
--- a/cpp/sca/runtime/xsd/sca-interface-cpp-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-interface-cpp-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-interface-java-1.1-cd04.xsd b/cpp/sca/xsd/sca-interface-java-1.1-cd04.xsd
index faf6d1cfb1..faf6d1cfb1 100644
--- a/cpp/sca/runtime/xsd/sca-interface-java-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-interface-java-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-interface-wsdl-1.1-cd04.xsd b/cpp/sca/xsd/sca-interface-wsdl-1.1-cd04.xsd
index 980e4f90f5..980e4f90f5 100644
--- a/cpp/sca/runtime/xsd/sca-interface-wsdl-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-interface-wsdl-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-jee-1.1-wd03.xsd b/cpp/sca/xsd/sca-jee-1.1-wd03.xsd
index 6df685b881..6df685b881 100644
--- a/cpp/sca/runtime/xsd/sca-jee-1.1-wd03.xsd
+++ b/cpp/sca/xsd/sca-jee-1.1-wd03.xsd
diff --git a/cpp/sca/runtime/xsd/sca-policy-1.1-cd04.xsd b/cpp/sca/xsd/sca-policy-1.1-cd04.xsd
index a6cdfb2be5..a6cdfb2be5 100644
--- a/cpp/sca/runtime/xsd/sca-policy-1.1-cd04.xsd
+++ b/cpp/sca/xsd/sca-policy-1.1-cd04.xsd
diff --git a/cpp/sca/runtime/xsd/sca-policy-1.1-intents-definitions-cd02.xml b/cpp/sca/xsd/sca-policy-1.1-intents-definitions-cd02.xml
index 8efde2653f..8efde2653f 100644
--- a/cpp/sca/runtime/xsd/sca-policy-1.1-intents-definitions-cd02.xml
+++ b/cpp/sca/xsd/sca-policy-1.1-intents-definitions-cd02.xml
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-dwr.xsd b/cpp/sca/xsd/tuscany-sca-1.1-binding-dwr.xsd
index de7bc6bdd0..de7bc6bdd0 100644
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-dwr.xsd
+++ b/cpp/sca/xsd/tuscany-sca-1.1-binding-dwr.xsd
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-http.xsd b/cpp/sca/xsd/tuscany-sca-1.1-binding-http.xsd
index ce8d47b575..ce8d47b575 100644
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-http.xsd
+++ b/cpp/sca/xsd/tuscany-sca-1.1-binding-http.xsd
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd b/cpp/sca/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
index 92142d117d..92142d117d 100644
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/cpp/sca/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-rmi.xsd b/cpp/sca/xsd/tuscany-sca-1.1-binding-rmi.xsd
index 9b15010624..9b15010624 100644
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-binding-rmi.xsd
+++ b/cpp/sca/xsd/tuscany-sca-1.1-binding-rmi.xsd
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-osgi.xsd b/cpp/sca/xsd/tuscany-sca-1.1-implementation-osgi.xsd
index dfe819d97f..dfe819d97f 100644
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/cpp/sca/xsd/tuscany-sca-1.1-implementation-osgi.xsd
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd b/cpp/sca/xsd/tuscany-sca-1.1-implementation-widget.xsd
index 8e65b402d7..8e65b402d7 100644
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd
+++ b/cpp/sca/xsd/tuscany-sca-1.1-implementation-widget.xsd
diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd b/cpp/sca/xsd/tuscany-sca-1.1.xsd
index fb0a0cf9d5..fb0a0cf9d5 100644
--- a/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd
+++ b/cpp/sca/xsd/tuscany-sca-1.1.xsd