Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 45064 invoked from network); 2 Oct 2006 13:20:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Oct 2006 13:20:23 -0000 Received: (qmail 19622 invoked by uid 500); 2 Oct 2006 13:20:22 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 19548 invoked by uid 500); 2 Oct 2006 13:20:22 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 19539 invoked by uid 99); 2 Oct 2006 13:20:22 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Oct 2006 06:20:22 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:64460] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 34/E9-16499-70211254 for ; Mon, 02 Oct 2006 06:20:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A9D561A981A; Mon, 2 Oct 2006 06:19:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452027 - /incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp Date: Mon, 02 Oct 2006 13:19:52 -0000 To: tuscany-commits@ws.apache.org From: ajborley@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061002131952.A9D561A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ajborley Date: Mon Oct 2 06:19:51 2006 New Revision: 452027 URL: http://svn.apache.org/viewvc?view=rev&rev=452027 Log: Changed from Tuscany Python module name of TuscanySCA to sca and TuscanySCAProxy to sca_proxy. Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp?view=diff&rev=452027&r1=452026&r2=452027 ============================================================================== --- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp (original) +++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp Mon Oct 2 06:19:51 2006 @@ -589,23 +589,23 @@ { // Import the TuscanySCA python-extension module - PyObject* pModuleName = PyString_FromString("TuscanySCAProxy"); - PyObject* tuscanySCAProxyModule = PyImport_Import(pModuleName); + PyObject* pModuleName = PyString_FromString("sca_proxy"); + PyObject* sca_proxy_module = PyImport_Import(pModuleName); Py_DECREF(pModuleName); - if(!tuscanySCAProxyModule) + if(!sca_proxy_module) { if(PyErr_Occurred()) { PyErr_Print(); } - string msg = "Failed to load the TuscanySCAProxy Python module - has it been successfully installed?\nReferences from Python components will not be supported"; + string msg = "Failed to load the sca_proxy Python module - has it been successfully installed?\nReferences from Python components will not be supported"; LOGERROR(0, msg.c_str()); } else { - // Get the TuscanySCAProxy class - PyObject* tuscanySCAProxyClass = PyObject_GetAttrString(tuscanySCAProxyModule, "TuscanySCAProxyClass"); + // Get the sca_proxy class + PyObject* sca_proxy_class = PyObject_GetAttrString(sca_proxy_module, "sca_proxy_class"); // Iterate through the references of the current component, adding // each reference to the module @@ -623,21 +623,21 @@ PyTuple_SetItem(tuscanySCAArgs, 1, Py_True); // Create the instance of the TuscanySCAReference class - PyObject* tuscanySCAProxyClassInstance = PyInstance_New(tuscanySCAProxyClass, tuscanySCAArgs, NULL); + PyObject* sca_proxy_classInstance = PyInstance_New(sca_proxy_class, tuscanySCAArgs, NULL); Py_DECREF(tuscanySCAArgs); - int success = PyModule_AddObject(module, (char*)referenceName.c_str(), tuscanySCAProxyClassInstance); + int success = PyModule_AddObject(module, (char*)referenceName.c_str(), sca_proxy_classInstance); if(success == 0) { - LOGINFO_1(3, "Successfully added TuscanySCAReferenceClassInstance as %s to pythonModule", referenceName.c_str()); + LOGINFO_1(3, "Successfully added sca_proxy_class instance as %s to pythonModule", referenceName.c_str()); } else { - LOGERROR_1(1, "Failed to add TuscanySCAReferenceClassInstance as %s to pythonModule", referenceName.c_str()); + LOGERROR_1(1, "Failed to add sca_proxy_class instance as %s to pythonModule", referenceName.c_str()); } } - Py_DECREF(tuscanySCAProxyModule); + Py_DECREF(sca_proxy_module); } } } // End namespace python --------------------------------------------------------------------- To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org For additional commands, e-mail: tuscany-commits-help@ws.apache.org