tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r441401 - in /incubator/tuscany/cpp/sca: ./ runtime/extensions/ runtime/extensions/php/src/ runtime/extensions/php/src/tuscany/sca/php/
Date Fri, 08 Sep 2006 07:01:25 GMT
Author: jsdelfino
Date: Fri Sep  8 00:01:25 2006
New Revision: 441401

URL: http://svn.apache.org/viewvc?view=rev&rev=441401
Log:
Integrated PHP build using PHP 5.0.4-10.5 on Linux, and removed dependency on CPPInterface

Modified:
    incubator/tuscany/cpp/sca/configure.ac
    incubator/tuscany/cpp/sca/runtime/extensions/Makefile.am
    incubator/tuscany/cpp/sca/runtime/extensions/php/src/Makefile.am
    incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h

Modified: incubator/tuscany/cpp/sca/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/configure.ac?view=diff&rev=441401&r1=441400&r2=441401
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Fri Sep  8 00:01:25 2006
@@ -54,6 +54,8 @@
                  runtime/extensions/python/src/Makefile
                  runtime/extensions/ruby/Makefile
                  runtime/extensions/ruby/src/Makefile
+                 runtime/extensions/php/Makefile
+                 runtime/extensions/php/src/Makefile
                  runtime/core/test/Makefile
                  runtime/core/test/CustomerInfo/Makefile
                  runtime/core/test/MyValue/Makefile

Modified: incubator/tuscany/cpp/sca/runtime/extensions/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/Makefile.am?view=diff&rev=441401&r1=441400&r2=441401
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/Makefile.am Fri Sep  8 00:01:25 2006
@@ -1 +1 @@
-SUBDIRS = cpp ws python ruby
+SUBDIRS = cpp ws python ruby php

Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/Makefile.am?view=diff&rev=441401&r1=441400&r2=441401
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/Makefile.am Fri Sep  8 00:01:25 2006
@@ -8,19 +8,20 @@
 libtuscany_sca_php_la_SOURCES = \
 tuscany/sca/php/PHPExtension.cpp \
 tuscany/sca/php/PHPImplementationExtension.cpp \
-tuscany/sca/php/PHPServiceProxy.cpp \
 tuscany/sca/php/PHPServiceWrapper.cpp \
 tuscany/sca/php/model/PHPImplementation.cpp \
-tuscany/sca/php/model/PHPReferenceBinding.cpp \
 tuscany/sca/php/model/PHPServiceBinding.cpp
 
 libtuscany_sca_php_la_LIBADD = -L${TUSCANY_SDOCPP}/lib -ltuscany_sdo \
 	-L$(top_builddir)/runtime/core/src -ltuscany_sca \
-	-L${PHP_LIB} -lphp
+	-L${PHP_LIB} -lphp5
 
 INCLUDES = -Imodel -I$(top_builddir)/runtime/core/src \
            -I${TUSCANY_SDOCPP}/include \
-           -I${PHP_INCLUDE}
+           -I${PHP_INCLUDE} \
+           -I${PHP_INCLUDE}/main \
+           -I${PHP_INCLUDE}/Zend \
+           -I${PHP_INCLUDE}/TSRM
                    
 AM_CPPFLAGS = $(CPPFLAGS) -D_DEBUG
                    

Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp?view=diff&rev=441401&r1=441400&r2=441401
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.cpp
Fri Sep  8 00:01:25 2006
@@ -29,9 +29,9 @@
 #include "tuscany/sca/model/Component.h"
 #include "tuscany/sca/model/Composite.h"
 #include "tuscany/sca/model/ServiceType.h"
+#include "tuscany/sca/model/Interface.h"
 #include "tuscany/sca/core/SCARuntime.h"
 #include "tuscany/sca/php/model/PHPImplementation.h"
-#include "tuscany/sca/cpp/model/CPPInterface.h"
 
 #include <php_embed.h>
 
@@ -98,8 +98,8 @@
                 LOGENTRY(1,"PHPServiceWrapper::constructor");
     
                 component = service->getComponent();
-                interf = (CPPInterface*)service->getType()->getInterface();
-                remotable = interf->getRemotable();                
+                interf = service->getType()->getInterface();
+                remotable = interf->isRemotable();                
 
                  // -----------------------------------------------
                 // Get the implementation for the target component

Modified: incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h?view=diff&rev=441401&r1=441400&r2=441401
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/php/src/tuscany/sca/php/PHPServiceWrapper.h
Fri Sep  8 00:01:25 2006
@@ -25,11 +25,9 @@
 #include "tuscany/sca/core/ServiceWrapper.h"
 #include "tuscany/sca/core/Operation.h"
 #include "tuscany/sca/model/Component.h"
-
-#include "tuscany/sca/cpp/model/CPPInterface.h"
+#include "tuscany/sca/model/Interface.h"
 
 using namespace tuscany::sca::model;
-using tuscany::sca::cpp::CPPInterface;
 
 
 namespace tuscany
@@ -98,7 +96,7 @@
                 /**
                  * A pointer to the interface which the service exposes.
                  */
-                CPPInterface* interf;
+                Interface* interf;
 
             };
             



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message