You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2006/08/28 09:14:56 UTC
svn commit: r437581 - in /incubator/tuscany/cpp/sca: deploy/extensions/cpp/
runtime/core/src/tuscany/sca/core/SCARuntime.cpp
runtime/core/src/tuscany/sca/model/ModelLoader.cpp
runtime/extensions/cpp/Makefile.am runtime/extensions/cpp/src/Makefile.am
Author: robbinspg
Date: Mon Aug 28 00:14:55 2006
New Revision: 437581
URL: http://svn.apache.org/viewvc?rev=437581&view=rev
Log:
Allow subdirs under extensions
move cpp extension to extensions/cpp
Added:
incubator/tuscany/cpp/sca/deploy/extensions/cpp/
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp?rev=437581&r1=437580&r2=437581&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp Mon Aug 28 00:14:55 2006
@@ -202,12 +202,12 @@
string pattern = "*.so";
#endif
- Files files(extensionsRoot, pattern, false);
+ Files files(extensionsRoot, pattern, true);
for (unsigned int i=0; i < files.size(); i++)
{
try
{
- Library lib = Library(extensionsRoot + "/" + files[i].getFileName());
+ Library lib = Library( files[i].getDirectory() + "/" + files[i].getFileName());
extensionsList.push_back(lib);
TUSCANY_IMPLEMENTATION_EXTENSION_INITIALIZE extension =
(TUSCANY_IMPLEMENTATION_EXTENSION_INITIALIZE)lib.getSymbol("tuscany_sca_extension_initialize");
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp?rev=437581&r1=437580&r2=437581&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/ModelLoader.cpp Mon Aug 28 00:14:55 2006
@@ -813,10 +813,10 @@
// Load any schema from the extensions directory
string extensionsRoot = root + "/extensions";
- Files files(extensionsRoot, "*.xsd", false);
+ Files files(extensionsRoot, "*.xsd", true);
for (unsigned int i=0; i < files.size(); i++)
{
- string extensionSchema = extensionsRoot + "/" + files[i].getFileName();
+ string extensionSchema = files[i].getDirectory() + "/" + files[i].getFileName();
myXSDHelper->defineFile(extensionSchema.c_str());
}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am?rev=437581&r1=437580&r2=437581&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/Makefile.am Mon Aug 28 00:14:55 2006
@@ -1,5 +1,5 @@
SUBDIRS = src
-datadir=$(prefix)/extensions
+datadir=$(prefix)/extensions/cpp
data_DATA = xsd/*.xsd
Modified: incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am?rev=437581&r1=437580&r2=437581&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/Makefile.am Mon Aug 28 00:14:55 2006
@@ -1,4 +1,4 @@
-libdir=$(prefix)/extensions
+libdir=$(prefix)/extensions/cpp
lib_LTLIBRARIES = libtuscany_sca_cpp.la
noinst_HEADERS = *.h model/*.h
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org