tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robbin...@apache.org
Subject svn commit: r510013 - in /incubator/tuscany/cpp/sca/samples: ./ PythonCalculator/ PythonCalculator/sample.calculator.client/ PythonCalculator/sample.calculator.wsclient/ PythonCalculator/sample.calculator/ RubyCalculator/ RubyCalculator/sample.calculat...
Date Wed, 21 Feb 2007 14:14:15 GMT
Author: robbinspg
Date: Wed Feb 21 06:14:14 2007
New Revision: 510013

URL: http://svn.apache.org/viewvc?view=rev&rev=510013
Log:
Remove ws binding dependency from <Language>Calculator samples

Removed:
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh
Modified:
    incubator/tuscany/cpp/sca/samples/PythonCalculator/Makefile.am
    incubator/tuscany/cpp/sca/samples/PythonCalculator/deploy.bat
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am
    incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
    incubator/tuscany/cpp/sca/samples/RubyCalculator/Makefile.am
    incubator/tuscany/cpp/sca/samples/RubyCalculator/deploy.bat
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am
    incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
    incubator/tuscany/cpp/sca/samples/configure.ac

Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/Makefile.am?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/Makefile.am Wed Feb 21 06:14:14 2007
@@ -16,6 +16,6 @@
 #  under the License.
 
 deploydir=$(prefix)/samples/PythonCalculator/deploy
-SUBDIRS = sample.calculator sample.calculator.client sample.calculator.wsclient
+SUBDIRS = sample.calculator sample.calculator.client
 EXTRA_DIST = *.composite README.html
 deploy_DATA = *.composite

Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/deploy.bat?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/deploy.bat Wed Feb 21 06:14:14 2007
@@ -38,18 +38,11 @@
 if not exist %destinationPath%\sample.calculator mkdir %destinationPath%\sample.calculator
 copy %sourcePath%\sample.calculator\*.composite     %destinationPath%\sample.calculator
 copy %sourcePath%\sample.calculator\*.py            %destinationPath%\sample.calculator
-copy %sourcePath%\sample.calculator\Calculator.wsdl %destinationPath%\sample.calculator
-copy %sourcePath%\sample.calculator\runwsserver.bat          %destinationPath%\sample.calculator
+copy %sourcePath%\sample.calculator\Calculator.wsdl %destinationPath%\sample.calculato
 
 if not exist %destinationPath%\sample.calculator.client mkdir %destinationPath%\sample.calculator.client
 copy %sourcePath%\sample.calculator.client\calculator_client.py %destinationPath%\sample.calculator.client
 copy %sourcePath%\sample.calculator.client\runclient.bat     %destinationPath%\sample.calculator.client
-
-if not exist %destinationPath%\sample.calculator.wsclient mkdir %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\calculator_wsclient.py               %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\sample.calculator.wsclient.composite %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\Calculator.wsdl                      %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\runwsclient.bat %destinationPath%\sample.calculator.wsclient
 
 copy %sourcePath%\*.composite %destinationPath%
 

Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite Wed
Feb 21 06:14:14 2007
@@ -24,10 +24,5 @@
         <component name="sample.calculator.CalculatorComponent">
         	<implementation.composite name="sample.calculator" />
        	</component>
-
-        <component name="sample.calculator.CalculatorWSClientComponent">
-        	<implementation.composite name="sample.calculator.wsclient" />
-        	<reference name="CalculatorService">sample.calculator.CalculatorComponent/CalculatorService</reference>
-       	</component>
-
+       	
 </composite>

Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
(original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat
Wed Feb 21 06:14:14 2007
@@ -31,13 +31,7 @@
 )
 echo using SDO installed at %TUSCANY_SDOCPP%
 
-if "%AXIS2C_HOME%" == "" (
-echo "AXIS2C_HOME not set"
-goto end
-)
-echo using Axis2C installed at %AXIS2C_HOME%
-
-set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\python\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\python\bin;%TUSCANY_SDOCPP%\bin;%PATH%
 set PYTHONPATH=%TUSCANY_SCACPP%\extensions\python\bin
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\

Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
(original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh
Wed Feb 21 06:14:14 2007
@@ -31,19 +31,13 @@
 fi
 echo "Using SDO installed at $TUSCANY_SDOCPP"
 
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set"
-exit;
-fi
-echo "Using Axis2C installed at $AXIS2C_HOME"
-
 if [ x$PYTHON_LIB != x ]; then
 echo "Using Python library installed at $PYTHON_LIB"
 export LD_LIBRARY_PATH=$PYTHON_LIB:$LD_LIBRARY_PATH
 export PATH=$PYTHON_LIB/../bin:$PATH
 fi
 
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/python/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/python/lib:$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
 export PYTHONPATH=$TUSCANY_SCACPP/extensions/python/lib:$PYTHONPATH
 
 export TUSCANY_SCACPP_ROOT=$APFULLDIR/../

Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am Wed Feb
21 06:14:14 2007
@@ -19,6 +19,5 @@
 compositedir=$(deploydir)/sample.calculator
 
 composite_DATA = *.composite *.wsdl *.py
-composite_SCRIPTS = runwsserver.sh
-EXTRA_DIST = *.composite *.wsdl *.py runwsserver.sh
 
+EXTRA_DIST = *.composite *.wsdl *.py

Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
(original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/sample.calculator.composite
Wed Feb 21 06:14:14 2007
@@ -21,12 +21,6 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
 	name="sample.calculator">
 
-	<service name="CalculatorService">
-		<interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-		<binding.ws/>
-		<reference>CalculatorComponent</reference>
-	</service>
-
 	<component name="CalculatorComponent">
         <implementation.python module="CalculatorImpl" scope="composite"/>
 	    <reference name="divideService">DivideComponent</reference>

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/Makefile.am?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/Makefile.am Wed Feb 21 06:14:14 2007
@@ -16,6 +16,6 @@
 #  under the License.
 
 deploydir=$(prefix)/samples/RubyCalculator/deploy
-SUBDIRS = sample.calculator sample.calculator.client sample.calculator.wsclient
+SUBDIRS = sample.calculator sample.calculator.client
 EXTRA_DIST = *.composite README.html
 deploy_DATA = *.composite

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/deploy.bat?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/deploy.bat Wed Feb 21 06:14:14 2007
@@ -39,17 +39,10 @@
 copy %sourcePath%\sample.calculator\*.composite     %destinationPath%\sample.calculator
 copy %sourcePath%\sample.calculator\*.rb            %destinationPath%\sample.calculator
 copy %sourcePath%\sample.calculator\Calculator.wsdl %destinationPath%\sample.calculator
-copy %sourcePath%\sample.calculator\runwsserver.bat          %destinationPath%\sample.calculator
 
 if not exist %destinationPath%\sample.calculator.client mkdir %destinationPath%\sample.calculator.client
 copy %sourcePath%\sample.calculator.client\CalculatorClient.rb %destinationPath%\sample.calculator.client
 copy %sourcePath%\sample.calculator.client\runclient.bat     %destinationPath%\sample.calculator.client
-
-if not exist %destinationPath%\sample.calculator.wsclient mkdir %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\CalculatorWSClient.rb               %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\sample.calculator.wsclient.composite %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\Calculator.wsdl                      %destinationPath%\sample.calculator.wsclient
-copy %sourcePath%\sample.calculator.wsclient\runwsclient.bat %destinationPath%\sample.calculator.wsclient
 
 copy %sourcePath%\*.composite %destinationPath%
 

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite Wed Feb
21 06:14:14 2007
@@ -25,9 +25,4 @@
         	<implementation.composite name="sample.calculator" />
        	</component>
 
-        <component name="sample.calculator.CalculatorWSClientComponent">
-        	<implementation.composite name="sample.calculator.wsclient" />
-        	<reference name="CalculatorService">sample.calculator.CalculatorComponent/CalculatorService</reference>
-       	</component>
-
 </composite>

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
(original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat
Wed Feb 21 06:14:14 2007
@@ -31,13 +31,7 @@
 )
 echo using SDO installed at %TUSCANY_SDOCPP%
 
-if "%AXIS2C_HOME%" == "" (
-echo "AXIS2C_HOME not set"
-goto end
-)
-echo using Axis2C installed at %AXIS2C_HOME%
-
-set PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+set PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%PATH%
 
 set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
 set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
(original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh
Wed Feb 21 06:14:14 2007
@@ -32,13 +32,7 @@
 fi
 echo "Using SDO installed at $TUSCANY_SDOCPP"
 
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set"
-exit;
-fi
-echo "Using Axis2C installed at $AXIS2C_HOME"
-
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
 
 export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
 export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am Wed Feb
21 06:14:14 2007
@@ -18,7 +18,5 @@
 deploydir=$(prefix)/samples/RubyCalculator/deploy
 compositedir=$(deploydir)/sample.calculator
 
-composite_SCRIPTS = runwsserver.sh
-
 composite_DATA = *.composite *.wsdl *.rb
-EXTRA_DIST = *.composite *.wsdl *.rb runwsserver.sh
+EXTRA_DIST = *.composite *.wsdl *.rb

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
(original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/sample.calculator.composite
Wed Feb 21 06:14:14 2007
@@ -21,12 +21,6 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
 	name="sample.calculator">
 
-	<service name="CalculatorService">
-		<interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
-		<binding.ws/>
-		<reference>CalculatorComponent</reference>
-	</service>
-
 	<component name="CalculatorComponent">
 		<implementation.ruby script="CalculatorImpl.rb" class="CalculatorImpl"/>
 	    <reference name="divideService">DivideComponent</reference>

Modified: incubator/tuscany/cpp/sca/samples/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/configure.ac?view=diff&rev=510013&r1=510012&r2=510013
==============================================================================
--- incubator/tuscany/cpp/sca/samples/configure.ac (original)
+++ incubator/tuscany/cpp/sca/samples/configure.ac Wed Feb 21 06:14:14 2007
@@ -196,11 +196,9 @@
                  RubyCalculator/Makefile
                  RubyCalculator/sample.calculator/Makefile
                  RubyCalculator/sample.calculator.client/Makefile
-                 RubyCalculator/sample.calculator.wsclient/Makefile
                  PythonCalculator/Makefile
                  PythonCalculator/sample.calculator/Makefile
                  PythonCalculator/sample.calculator.client/Makefile
-                 PythonCalculator/sample.calculator.wsclient/Makefile
                  PythonWeatherForecast/Makefile
                  PythonWeatherForecast/sample.weather/Makefile
                  PythonWeatherForecast/sample.weather.client/Makefile



---------------------------------------------------------------------
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