You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2006/05/09 11:30:48 UTC
svn commit: r405358 - in /incubator/tuscany/cpp/sca/samples/Calculator: ./
CalculatorModule/ Client/
Author: edslattery
Date: Tue May 9 02:30:23 2006
New Revision: 405358
URL: http://svn.apache.org/viewcvs?rev=405358&view=rev
Log:
tuscany 339
Modified:
incubator/tuscany/cpp/sca/samples/Calculator/Calculator.ncb
incubator/tuscany/cpp/sca/samples/Calculator/Calculator.opt
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.dsp
incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.plg
incubator/tuscany/cpp/sca/samples/Calculator/Client/Calc.cpp
incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.dsp
incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.plg
incubator/tuscany/cpp/sca/samples/Calculator/Client/readme.txt
incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Calculator.ncb
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/Calculator.ncb?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Calculator.opt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/Calculator.opt?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.dsp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.dsp?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.dsp (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.dsp Tue May 9 02:30:23 2006
@@ -67,8 +67,8 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATORMODULE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /I "$(SDO4CPP)/include" /I "$(SCA4CPP)/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATORMODULE_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATORMODULE_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATORMODULE_EXPORTS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(SDO4CPP)/lib" /libpath:"$(SCA4CPP)/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
!ENDIF
Modified: incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.plg
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.plg?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.plg (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/CalculatorModule/CalculatorModule.plg Tue May 9 02:30:23 2006
@@ -6,22 +6,22 @@
--------------------Configuration: CalculatorModule - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\winadmin\LOCALS~1\Temp\RSP7D.tmp" with contents
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF28.tmp" with contents
[
-/nologo /MDd /W3 /Gm /GX /ZI /I "D:\Development\tuscany\cpp\sdo/include" /I "D:\Development\tuscany\cpp\sca/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATORMODULE_EXPORTS" /Fp"Debug/CalculatorModule.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
-"D:\Development\tuscany\cpp\sca\samples\Calculator\CalculatorModule\CalculatorImpl.cpp"
-"D:\Development\tuscany\cpp\sca\samples\Calculator\CalculatorModule\CalculatorImpl_CalculatorService_Proxy.cpp"
-"D:\Development\tuscany\cpp\sca\samples\Calculator\CalculatorModule\CalculatorImpl_CalculatorService_Wrapper.cpp"
+/nologo /MDd /W3 /Gm /GX /ZI /I "c:\apache\test_checkout\sdo/include" /I "c:\apache\test_checkout\sca/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATORMODULE_EXPORTS" /Fp"Debug/CalculatorModule.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
+"C:\apache\test_checkout\sca\samples\Calculator\CalculatorModule\CalculatorImpl.cpp"
+"C:\apache\test_checkout\sca\samples\Calculator\CalculatorModule\CalculatorImpl_CalculatorService_Proxy.cpp"
+"C:\apache\test_checkout\sca\samples\Calculator\CalculatorModule\CalculatorImpl_CalculatorService_Wrapper.cpp"
]
-Creating command line "cl.exe @C:\DOCUME~1\winadmin\LOCALS~1\Temp\RSP7D.tmp"
-Creating temporary file "C:\DOCUME~1\winadmin\LOCALS~1\Temp\RSP7E.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF28.tmp"
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF29.tmp" with contents
[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /incremental:yes /pdb:"Debug/CalculatorModule.pdb" /debug /machine:I386 /out:"Debug/CalculatorModule.dll" /implib:"Debug/CalculatorModule.lib" /pdbtype:sept /libpath:"D:\Development\tuscany\cpp\sdo/lib" /libpath:"D:\Development\tuscany\cpp\sca/lib"
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /incremental:yes /pdb:"Debug/CalculatorModule.pdb" /debug /machine:I386 /out:"Debug/CalculatorModule.dll" /implib:"Debug/CalculatorModule.lib" /pdbtype:sept /libpath:"c:\apache\test_checkout\sdo/lib" /libpath:"c:\apache\test_checkout\sca/lib"
.\Debug\CalculatorImpl.obj
.\Debug\CalculatorImpl_CalculatorService_Proxy.obj
.\Debug\CalculatorImpl_CalculatorService_Wrapper.obj
]
-Creating command line "link.exe @C:\DOCUME~1\winadmin\LOCALS~1\Temp\RSP7E.tmp"
+Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF29.tmp"
<h3>Output Window</h3>
Compiling...
CalculatorImpl.cpp
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Client/Calc.cpp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/Client/Calc.cpp?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/Client/Calc.cpp (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/Client/Calc.cpp Tue May 9 02:30:23 2006
@@ -133,11 +133,25 @@
bool IsNumber (const char *p)
{
int len = strlen(p);
- for (int i = 0; i < len; i++)
+ int pointcount = 0;
+
+ if (!isdigit (p[0]) && p[0] != '-' && p[0] != '+')
+ {
+ return false;
+ }
+ for (int i = 1; i < len; i++)
{
if (!isdigit (p[i]))
{
- return false;
+ if (p[i] == '.')
+ {
+ if (pointcount > 0) return false;
+ pointcount++;
+ }
+ else
+ {
+ return false;
+ }
}
}
return true;
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.dsp
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.dsp?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.dsp (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.dsp Tue May 9 02:30:23 2006
@@ -48,8 +48,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "Client - Win32 Debug"
@@ -63,16 +63,16 @@
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "$(SDO4CPP)/include" /I "$(SCA4CPP)/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sdo.lib tuscany_sca.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(SDO4CPP)/lib" /libpath:"$(SCA4CPP)/lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sdo.lib tuscany_sca.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
!ENDIF
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.plg
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.plg?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.plg (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/Client/Client.plg Tue May 9 02:30:23 2006
@@ -6,6 +6,22 @@
--------------------Configuration: Client - Win32 Debug--------------------
</h3>
<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF2D.tmp" with contents
+[
+/nologo /MD /W3 /Gm /GX /ZI /Od /I "c:\apache\test_checkout\sdo/include" /I "c:\apache\test_checkout\sca/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Debug/Client.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c
+"C:\apache\test_checkout\sca\samples\Calculator\Client\Calc.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF2D.tmp"
+Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF2E.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sdo.lib tuscany_sca.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/Client.pdb" /debug /machine:I386 /out:"Debug/Client.exe" /pdbtype:sept /libpath:"c:\apache\test_checkout\sdo/lib" /libpath:"c:\apache\test_checkout\sca/lib"
+.\Debug\Calc.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPF2E.tmp"
+<h3>Output Window</h3>
+Compiling...
+Calc.cpp
+Linking...
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Client/readme.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/Client/readme.txt?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/Client/readme.txt (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/Client/readme.txt Tue May 9 02:30:23 2006
@@ -19,6 +19,17 @@
Build instructions
------------------
+Notes:
+
+The projects are set up to locate SCA and SDO libraries using the environment variables
+TUSCANY_SCACPP and TUSCANY_SDOCPP. These must be set before building.
+
+scagan is a code generation tool written in java. This will need to be built before you
+can run it. To build scagen, you must go to the tools/scagen directory, and type "ant".
+(You must have apache ant installed, and have a valid java virtual machine installed -
+upwards of version 1.4.2). Once scagen has successfully built, it can be run from the
+sca/bin directory.
+
1) Build the SCA module.
- Set CalculatorModule project as the active project.
Right click->Set as active project
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd?rev=405358&r1=405357&r2=405358&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd Tue May 9 02:30:23 2006
@@ -2,13 +2,13 @@
rem Runs the client after setting the SCA environment variables to use the
rem CalculatorSubsystem
setlocal
-set SCA4CPP_SYSTEM_ROOT=%~d0%~p0\..\..\runtime
+set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\..\runtime
rem Only need to specify the subsystem (and not the moduleComponent as well) because
rem there is only one moduleComponent in the subsystem - it is a very simple sample.
-set SCA4CPP_DEFAULT_MODULE=CalculatorSubsystem
+set TUSCANY_SCACPP_DEFAULT_MODULE=CalculatorSubsystem
rem Run the client
%~d0%~p0\debug\Client.exe %*
-endlocal
\ No newline at end of file
+endlocal