You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/11/16 04:56:41 UTC
svn commit: r475564 - in /incubator/tuscany/cpp/sca/samples: BigBank/
BigBank/bigbank.account/ BigBank/bigbank.client/
BigBank/bigbank.phpwsclient/ BigBank/bigbank.wsclient/ Calculator/
Calculator/sample.calculator.client/ Calculator/sample.calculator....
Author: jsdelfino
Date: Wed Nov 15 19:56:39 2006
New Revision: 475564
URL: http://svn.apache.org/viewvc?view=rev&rev=475564
Log:
Cleanup of some of the samples. Renamed *solution*.composite to *app*.composite. Removed unnecessary environment variable declarations in shell scripts and bat files. Adjusted URIs of Web Services in .composite and .wsdl files to include the top level composite component name.
Added:
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.app.composite (with props)
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.app.composite (with props)
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite (with props)
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.app.composite (with props)
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite (with props)
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite (with props)
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite (with props)
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite (with props)
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite (with props)
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite (with props)
Removed:
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.accountmanagement.composite
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.solution.composite
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.solution.composite
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.accountmanagement.composite
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.solution.composite
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.solution.composite
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.solution.composite
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.solution.composite
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.solution.composite
incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.solution.composite
Modified:
incubator/tuscany/cpp/sca/samples/BigBank/README
incubator/tuscany/cpp/sca/samples/BigBank/README.html
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/AccountService.wsdl
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.bat
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.sh
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.bat
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.sh
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl
incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp
incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat
incubator/tuscany/cpp/sca/samples/Calculator/README
incubator/tuscany/cpp/sca/samples/Calculator/README.html
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.bat
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.sh
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Calculator.wsdl
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.bat
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.sh
incubator/tuscany/cpp/sca/samples/PythonCalculator/README
incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html
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.wsclient/Calculator.wsdl
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl
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/RubyBank/README
incubator/tuscany/cpp/sca/samples/RubyBank/README.html
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/AccountService.wsdl
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.bat
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.sh
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.sh
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/AccountService.wsdl
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/bigbank.wsclient.composite
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.bat
incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.sh
incubator/tuscany/cpp/sca/samples/RubyCalculator/README
incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html
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.wsclient/Calculator.wsdl
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl
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/BigBank/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/README?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/README (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/README Wed Nov 15 19:56:39 2006
@@ -22,9 +22,8 @@
A sample PHP client which calls the BigBank Web service and then
deconstructs and displays the result by using the SDO for PHP extension.
-Additionally, there is the bigbank.accountmanagement.composite file. This
-describes the configuration of the SCA Calculator composite deployed to the
-SCA runtime.
+Additionally, there is the bigbank.app.composite file. This describes the
+configuration of the SCA Calculator composite deployed to the SCA runtime.
See the README.html file for instructions to build and run this sample
Modified: incubator/tuscany/cpp/sca/samples/BigBank/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/README.html?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/README.html Wed Nov 15 19:56:39 2006
@@ -76,9 +76,8 @@
</P>
</LI>
</UL>
- <P>Additionally, there is the bigbank.accountmanagement.composite file. This
- describes the configuration of the SCA Calculator composite deployed to the SCA
- runtime.
+ <P>Additionally, there is the bigbank.app.composite file. This describes the
+ configuration of the SCA Calculator composite deployed to the SCA runtime.
</P>
</DIV>
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/AccountService.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/AccountService.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/AccountService.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/AccountService.wsdl Wed Nov 15 19:56:39 2006
@@ -120,7 +120,7 @@
<wsdl:port binding="tns:AccountServiceSOAP"
name="AccountServiceSOAP">
<soap:address
- location="http://localhost:9090/axis2/services/AccountService" />
+ location="http://localhost:9090/axis2/services/bigbank.AccountManagementComponent/AccountService" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.bat (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.bat Wed Nov 15 19:56:39 2006
@@ -37,12 +37,11 @@
)
echo Using Axis2C installed at %AXIS2C_HOME%
-set APFULLDIR=%~d0%~p0
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
-
-rem Run the client
+rem Run the server
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+
+set APFULLDIR=%~d0%~p0
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
cd %AXIS2C_HOME%\bin
.\axis2_http_server.exe
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.sh (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/runwsserver.sh Wed Nov 15 19:56:39 2006
@@ -37,12 +37,9 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
cd $AXIS2C_HOME/bin
./axis2_http_server
Added: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="bigbank.app">
+
+ <component name="bigbank.AccountManagementComponent">
+ <implementation.composite name="bigbank.account"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.bat Wed Nov 15 19:56:39 2006
@@ -37,12 +37,12 @@
)
echo Using Axis2C installed at %AXIS2C_HOME%
-set APFULLDIR=%~d0%~p0
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
-
rem Run the client
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+
+set APFULLDIR=%~d0%~p0
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent
.\AccountClient.exe 1234
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/runclient.sh Wed Nov 15 19:56:39 2006
@@ -37,12 +37,10 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent
./account_client 1234
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.phpwsclient/AccountService.wsdl Wed Nov 15 19:56:39 2006
@@ -120,7 +120,7 @@
<wsdl:port binding="tns:AccountServiceSOAP"
name="AccountServiceSOAP">
<soap:address
- location="http://localhost:9090/axis2/services/AccountService" />
+ location="http://localhost:9090/axis2/services/bigbank.AccountManagementComponent/AccountService" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/AccountWSClient.cpp Wed Nov 15 19:56:39 2006
@@ -51,7 +51,7 @@
if (!client_home)
client_home = "../../deploy";
- address = "http://localhost:9090/axis2/services/AccountService";
+ address = "http://localhost:9090/axis2/services/bigbank.AccountManagementComponent/AccountService";
if (argc > 1 )
operation = argv[1];
if (AXIS2_STRCMP(operation, "-h") == 0)
Modified: incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/deploy.bat Wed Nov 15 19:56:39 2006
@@ -48,7 +48,7 @@
if not exist %samplebb% mkdir %samplebb%
set samplebbsrc=%srcdir%\%package%
-copy %srcdir%\bigbank.accountmanagement.composite %bbdeploydir%
+copy %srcdir%\bigbank.app.composite %bbdeploydir%
copy %samplebbsrc%\*.wsdl %samplebb%
copy %samplebbsrc%\*.composite %samplebb%
copy %samplebbsrc%\*.componentType %samplebb%
Modified: incubator/tuscany/cpp/sca/samples/Calculator/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/README?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/README (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/README Wed Nov 15 19:56:39 2006
@@ -16,7 +16,7 @@
- sample.calculator.wsclient
A sample Axis2 Web Service client which calls the Calculator Web service.
-Additionally, there is the sample.calculator.solution.composite file. This
+Additionally, there is the sample.calculator.app.composite file. This
describes the configuration of the SCA Calculator composite deployed to the
SCA runtime.
Modified: incubator/tuscany/cpp/sca/samples/Calculator/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/README.html?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/README.html Wed Nov 15 19:56:39 2006
@@ -56,7 +56,7 @@
A sample Axis2 Web Service client which calls the Calculator Web service.
</LI>
</UL>
- <P>Additionally, there is the sample.calculator.solution.composite file. This
+ <P>Additionally, there is the sample.calculator.app.composite file. This
describes the configuration of the SCA Calculator composite deployed to the SCA
runtime.
</P>
Added: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="sample.calculator.app">
+
+ <component name="sample.calculator.CalculatorComponent">
+ <implementation.composite name="sample.calculator" />
+ </component>
+
+</composite>
+
Propchange: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.bat Wed Nov 15 19:56:39 2006
@@ -37,10 +37,10 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
.\calculator_client.exe div 5 2
Modified: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/runclient.sh Wed Nov 15 19:56:39 2006
@@ -37,11 +37,9 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
./calculator_client div 5 2
Modified: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/CalculatorWSClient.cpp Wed Nov 15 19:56:39 2006
@@ -52,7 +52,7 @@
if (!client_home)
client_home = "../../deploy";
- address = "http://localhost:9090/axis2/services/CalculatorService";
+ address = "http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService";
if (argc > 1 )
operation = argv[1];
if (AXIS2_STRCMP(operation, "-h") == 0)
Modified: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Calculator.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Calculator.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Calculator.wsdl Wed Nov 15 19:56:39 2006
@@ -155,7 +155,7 @@
<service name="CalculatorService">
<port name="CalculatorPort"
binding="tns:CalculatorBinding">
- <soap:address location="http://localhost:9090/axis2/services/CalculatorService" />
+ <soap:address location="http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService" />
</port>
</service>
</definitions>
Modified: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.bat (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.bat Wed Nov 15 19:56:39 2006
@@ -37,10 +37,9 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
cd %AXIS2C_HOME%\bin
.\axis2_http_server.exe
Modified: incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.sh (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/runwsserver.sh Wed Nov 15 19:56:39 2006
@@ -37,12 +37,9 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
cd $AXIS2C_HOME/bin
./axis2_http_server
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/README?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/README (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/README Wed Nov 15 19:56:39 2006
@@ -17,7 +17,7 @@
A sample Axis2 Web Service client which calls the Calculator Web service.
-Additionally, there is the sample.calculator.solution.composite file. This
+Additionally, there is the sample.calculator.app.composite file. This
describes the configuration of the SCA Calculator composite deployed to the
SCA runtime.
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html Wed Nov 15 19:56:39 2006
@@ -61,7 +61,7 @@
that calls the Calculator Web Service.
</LI>
</UL>
- <P>Additionally, there is the sample.calculator.solution.composite file. This
+ <P>Additionally, there is the sample.calculator.app.composite file. This
describes the configuration of the SCA Calculator composite deployed to the SCA
runtime.
</P>
Added: 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=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="sample.calculator.app">
+
+ <component name="sample.calculator.CalculatorComponent">
+ <implementation.composite name="sample.calculator" />
+ </component>
+
+ <component name="sample.calculator.CalculatorWSClientComponent">
+ <implementation.composite name="sample.calculator.wsclient" />
+ </component>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.bat Wed Nov 15 19:56:39 2006
@@ -37,13 +37,13 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\python\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
set PYTHONPATH=%TUSCANY_SCACPP%\extensions\python\bin
-cd %TUSCANY_SCACPP_SYSTEM_ROOT%\sample.calculator.client
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
+
+cd %TUSCANY_SCACPP_ROOT%\sample.calculator.client
python calculator_client.py div 5 2
:end
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=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/runclient.sh Wed Nov 15 19:56:39 2006
@@ -37,13 +37,11 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/python/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
export PYTHONPATH=$TUSCANY_SCACPP/extensions/python/lib:$PYTHONPATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
-cd $TUSCANY_SCACPP_SYSTEM_ROOT/sample.calculator.client
+cd $TUSCANY_SCACPP_ROOT/sample.calculator.client
python calculator_client.py div 5 2
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Calculator.wsdl Wed Nov 15 19:56:39 2006
@@ -111,4 +111,51 @@
</operation>
</portType>
+ <binding name="CalculatorBinding"
+ type="tns:Calculator">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <operation name="add">
+ <soap:operation soapAction="CalculatorService#add" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="sub">
+ <soap:operation soapAction="CalculatorService#sub" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="mul">
+ <soap:operation soapAction="CalculatorService#mul" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="div">
+ <soap:operation soapAction="CalculatorService#div" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ </binding>
+
+ <service name="CalculatorService">
+ <port name="CalculatorPort"
+ binding="tns:CalculatorBinding">
+ <soap:address location="http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService" />
+ </port>
+ </service>
</definitions>
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.bat Wed Nov 15 19:56:39 2006
@@ -37,13 +37,13 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorWSClientComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\python\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
set PYTHONPATH=%TUSCANY_SCACPP%\extensions\python\bin
-cd %TUSCANY_SCACPP_SYSTEM_ROOT%\sample.calculator.wsclient
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorWSClientComponent
+
+cd %TUSCANY_SCACPP_ROOT%\sample.calculator.wsclient
python calculator_wsclient.py div 5 2
:end
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/runwsclient.sh Wed Nov 15 19:56:39 2006
@@ -37,13 +37,11 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/python/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
export PYTHONPATH=$TUSCANY_SCACPP/extensions/python/lib:$PYTHONPATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorWSClientComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorWSClientComponent
-cd $TUSCANY_SCACPP_SYSTEM_ROOT/sample.calculator.wsclient
+cd $TUSCANY_SCACPP_ROOT/sample.calculator.wsclient
python calculator_wsclient.py div 5 2
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite Wed Nov 15 19:56:39 2006
@@ -24,7 +24,7 @@
<reference name="CalculatorService">
<interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
- <binding.ws uri="http://localhost:9090/axis2/services/CalculatorService"/>
+ <binding.ws uri="http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService"/>
</reference>
</composite>
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Calculator.wsdl Wed Nov 15 19:56:39 2006
@@ -155,7 +155,7 @@
<service name="CalculatorService">
<port name="CalculatorPort"
binding="tns:CalculatorBinding">
- <soap:address location="http://localhost:9090/axis2/services/CalculatorService" />
+ <soap:address location="http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService" />
</port>
</service>
</definitions>
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.bat Wed Nov 15 19:56:39 2006
@@ -37,11 +37,10 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\python\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
set PYTHONPATH=%TUSCANY_SCACPP%\extensions\python\bin
+
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
cd %AXIS2C_HOME%\bin
.\axis2_http_server.exe
Modified: incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/runwsserver.sh Wed Nov 15 19:56:39 2006
@@ -37,13 +37,10 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/python/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
export PYTHONPATH=$TUSCANY_SCACPP/extensions/python/lib:$PYTHONPATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
+export TUSCANY_SCACPP_SYSTEM_ROOT=$APFULLDIR/../
cd $AXIS2C_HOME/bin
./axis2_http_server
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/README?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/README (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/README Wed Nov 15 19:56:39 2006
@@ -15,8 +15,7 @@
- bigbank.client
A sample client which does a local call to the BigBank service.
-Additionally, there is the bigbank.accountmanagement.composite file. This
-describes the configuration of the SCA Calculator composite deployed to the
-SCA runtime.
+Additionally, there is the bigbank.app.composite file. This describes the
+configuration of the SCA Calculator composite deployed to the SCA runtime.
See the README.html file for instructions to build and run this sample
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/README.html?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/README.html Wed Nov 15 19:56:39 2006
@@ -55,7 +55,7 @@
A sample client which does a local call to the RubyBank service.
</LI>
</UL>
- <P>Additionally, there is the bigbank.accountmanagement.composite file. This
+ <P>Additionally, there is the bigbank.app.composite file. This
describes the configuration of the SCA Calculator composite deployed to the SCA
runtime.
</P>
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/AccountService.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/AccountService.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/AccountService.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/AccountService.wsdl Wed Nov 15 19:56:39 2006
@@ -120,7 +120,7 @@
<wsdl:port binding="tns:AccountServiceSOAP"
name="AccountServiceSOAP">
<soap:address
- location="http://localhost:9090/axis2/services/AccountService" />
+ location="http://localhost:9090/axis2/services/bigbank.AccountManagementComponent/AccountService" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.bat Wed Nov 15 19:56:39 2006
@@ -38,10 +38,9 @@
echo Using Axis2C installed at %AXIS2C_HOME%
set APFULLDIR=%~d0%~p0
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
-rem Run the client
+rem Run the server
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
cd %AXIS2C_HOME%\bin
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/runwsserver.sh Wed Nov 15 19:56:39 2006
@@ -37,12 +37,9 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
cd $AXIS2C_HOME/bin
./axis2_http_server
Added: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="bigbank.app">
+
+ <component name="bigbank.AccountManagementComponent">
+ <implementation.composite name="bigbank.account"/>
+ </component>
+
+ <component name="bigbank.AccountWSClientComponent">
+ <implementation.composite name="bigbank.wsclient"/>
+ </component>
+
+</composite>
+
\ No newline at end of file
Propchange: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat Wed Nov 15 19:56:39 2006
@@ -37,14 +37,13 @@
)
echo Using Axis2C installed at %AXIS2C_HOME%
-set APFULLDIR=%~d0%~p0
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
-
rem Run the client
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
-cd %TUSCANY_SCACPP_SYSTEM_ROOT%\bigbank.client
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent
+
+cd %TUSCANY_SCACPP_ROOT%\bigbank.client
ruby -I%TUSCANY_SCACPP%\extensions\ruby\bin AccountClient.rb
:end
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.sh Wed Nov 15 19:56:39 2006
@@ -38,12 +38,10 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=bigbank.AccountManagementComponent
-cd $TUSCANY_SCACPP_SYSTEM_ROOT/bigbank.client
+cd $TUSCANY_SCACPP_ROOT/bigbank.client
ruby -I$TUSCANY_SCACPP/extensions/ruby/lib AccountClient.rb
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/AccountService.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/AccountService.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/AccountService.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/AccountService.wsdl Wed Nov 15 19:56:39 2006
@@ -120,7 +120,7 @@
<wsdl:port binding="tns:AccountServiceSOAP"
name="AccountServiceSOAP">
<soap:address
- location="http://localhost:9090/axis2/services/AccountService" />
+ location="http://localhost:9090/axis2/services/bigbank.AccountManagementComponent/AccountService" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/bigbank.wsclient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/bigbank.wsclient.composite?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/bigbank.wsclient.composite (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/bigbank.wsclient.composite Wed Nov 15 19:56:39 2006
@@ -23,7 +23,7 @@
<reference name="AccountService">
<interface.wsdl interface="http://www.bigbank.com/AccountService#wsdl.interface(AccountService)"/>
- <binding.ws uri="http://localhost:9090axis2/services/AccountService"/>
+ <binding.ws uri="http://localhost:9090/axis2/services/bigbank.AccountManagementComponent/AccountService"/>
</reference>
</composite>
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.bat Wed Nov 15 19:56:39 2006
@@ -37,15 +37,14 @@
)
echo Using Axis2C installed at %AXIS2C_HOME%
-set APFULLDIR=%~d0%~p0
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountManagementComponent
-
rem Run the client
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
-cd %TUSCANY_SCACPP_SYSTEM_ROOT%\bigbank.client
-ruby -I%TUSCANY_SCACPP%\extensions\ruby\lib AccountClient.rb
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=bigbank.AccountWSClientComponent
+
+cd %TUSCANY_SCACPP_ROOT%\bigbank.wsclient
+ruby -I%TUSCANY_SCACPP%\extensions\ruby\lib AccountWSClient.rb
:end
endlocal
Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.wsclient/runwsclient.sh Wed Nov 15 19:56:39 2006
@@ -38,12 +38,10 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=bigbank.AccountWSClientComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=bigbank.AccountWSClientComponent
-cd $TUSCANY_SCACPP_SYSTEM_ROOT/bigbank.wsclient
+cd $TUSCANY_SCACPP_ROOT/bigbank.wsclient
ruby -I$TUSCANY_SCACPP/extensions/ruby/lib AccountWSClient.rb
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/README?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/README (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/README Wed Nov 15 19:56:39 2006
@@ -16,7 +16,7 @@
- sample.calculator.wsclient
A sample Axis2 Web Service client which calls the Calculator Web service.
-Additionally, there is the sample.calculator.solution.composite file. This
+Additionally, there is the sample.calculator.app.composite file. This
describes the configuration of the SCA Calculator composite deployed to the
SCA runtime.
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html Wed Nov 15 19:56:39 2006
@@ -57,7 +57,7 @@
that calls the Calculator Web Service.
</LI>
</UL>
- <P>Additionally, there is the sample.calculator.solution.composite file. This
+ <P>Additionally, there is the sample.calculator.app.composite file. This
describes the configuration of the SCA Calculator composite deployed to the SCA
runtime.
</P>
Added: 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=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="sample.calculator.app">
+
+ <component name="sample.calculator.CalculatorComponent">
+ <implementation.composite name="sample.calculator" />
+ </component>
+
+ <component name="sample.calculator.CalculatorWSClientComponent">
+ <implementation.composite name="sample.calculator.wsclient" />
+ </component>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat Wed Nov 15 19:56:39 2006
@@ -37,12 +37,12 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
-cd %TUSCANY_SCACPP_SYSTEM_ROOT%\sample.calculator.client
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
+
+cd %TUSCANY_SCACPP_ROOT%\sample.calculator.client
ruby -I%TUSCANY_SCACPP%\extensions\ruby\bin CalculatorClient.rb
:end
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=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.sh Wed Nov 15 19:56:39 2006
@@ -38,12 +38,10 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
-cd $TUSCANY_SCACPP_SYSTEM_ROOT/sample.calculator.client
+cd $TUSCANY_SCACPP_ROOT/sample.calculator.client
ruby -I$TUSCANY_SCACPP/extensions/ruby/lib CalculatorClient.rb
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Calculator.wsdl Wed Nov 15 19:56:39 2006
@@ -111,4 +111,51 @@
</operation>
</portType>
+ <binding name="CalculatorBinding"
+ type="tns:Calculator">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <operation name="add">
+ <soap:operation soapAction="CalculatorService#add" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="sub">
+ <soap:operation soapAction="CalculatorService#sub" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="mul">
+ <soap:operation soapAction="CalculatorService#mul" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="div">
+ <soap:operation soapAction="CalculatorService#div" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ </binding>
+
+ <service name="CalculatorService">
+ <port name="CalculatorPort"
+ binding="tns:CalculatorBinding">
+ <soap:address location="http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService" />
+ </port>
+ </service>
</definitions>
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.bat Wed Nov 15 19:56:39 2006
@@ -37,12 +37,12 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorWSClientComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
-cd %TUSCANY_SCACPP_SYSTEM_ROOT%\sample.calculator.wsclient
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
+set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorWSClientComponent
+
+cd %TUSCANY_SCACPP_ROOT%\sample.calculator.wsclient
ruby -I%TUSCANY_SCACPP%\extensions\ruby\bin CalculatorWSClient.rb
:end
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/runwsclient.sh Wed Nov 15 19:56:39 2006
@@ -37,12 +37,10 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorWSClientComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
+export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorWSClientComponent
-cd $TUSCANY_SCACPP_SYSTEM_ROOT/sample.calculator.wsclient
+cd $TUSCANY_SCACPP_ROOT/sample.calculator.wsclient
ruby -I$TUSCANY_SCACPP/extensions/ruby/lib CalculatorWSClient.rb
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/sample.calculator.wsclient.composite Wed Nov 15 19:56:39 2006
@@ -23,7 +23,7 @@
<reference name="CalculatorService">
<interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
- <binding.ws uri="http://localhost:9090/axis2/services/CalculatorService"/>
+ <binding.ws uri="http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService"/>
</reference>
</composite>
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Calculator.wsdl Wed Nov 15 19:56:39 2006
@@ -111,4 +111,51 @@
</operation>
</portType>
+ <binding name="CalculatorBinding"
+ type="tns:Calculator">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <operation name="add">
+ <soap:operation soapAction="CalculatorService#add" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="sub">
+ <soap:operation soapAction="CalculatorService#sub" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="mul">
+ <soap:operation soapAction="CalculatorService#mul" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <operation name="div">
+ <soap:operation soapAction="CalculatorService#div" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ </binding>
+
+ <service name="CalculatorService">
+ <port name="CalculatorPort"
+ binding="tns:CalculatorBinding">
+ <soap:address location="http://localhost:9090/axis2/services/sample.calculator.CalculatorComponent/CalculatorService" />
+ </port>
+ </service>
</definitions>
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.bat Wed Nov 15 19:56:39 2006
@@ -37,10 +37,9 @@
)
echo using Axis2C installed at %AXIS2C_HOME%
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
-
set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+
+set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
cd %AXIS2C_HOME%\bin
.\axis2_http_server.exe
Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh?view=diff&rev=475564&r1=475563&r2=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/runwsserver.sh Wed Nov 15 19:56:39 2006
@@ -37,12 +37,9 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-TEST_SYSTEM=$APFULLDIR/../
-
export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
-export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_SYSTEM
-export TUSCANY_SCACPP_DEFAULT_COMPONENT=sample.calculator.CalculatorComponent
+export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
cd $AXIS2C_HOME/bin
./axis2_http_server
Added: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="supplychain.demo.app">
+
+ <component name="supplychain.DemoClient">
+ <implementation.composite name="supplychain.demo"/>
+ <reference name="retailer">supplychain.Retailer/RetailerService</reference>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ </component>
+
+ <component name="supplychain.Logging">
+ <implementation.composite name="supplychain.logging"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.demo.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="supplychain.manufacturerA.app">
+
+ <component name="supplychain.manufacturerA">
+ <implementation.composite name="supplychain.manufacturer"/>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ <property name="manufacturerID">manufacturerA</property>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerA.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="supplychain.manufacturerB.app">
+
+ <component name="supplychain.manufacturerB">
+ <implementation.composite name="supplychain.manufacturer"/>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ <property name="manufacturerID">manufacturerB</property>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerB.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="supplychain.manufacturerC.app">
+
+ <component name="supplychain.manufacturerC">
+ <implementation.composite name="supplychain.manufacturer"/>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ <property name="manufacturerID">manufacturerC</property>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.manufacturerC.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite?view=auto&rev=475564
==============================================================================
--- incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite (added)
+++ incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite Wed Nov 15 19:56:39 2006
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ name="supplychain.retailer.app">
+
+ <component name="supplychain.Retailer">
+ <implementation.composite name="supplychain.retailer"/>
+ <reference name="warehouse">supplychain.WarehouseA/WarehouseService</reference>
+ <reference name="warehouse">supplychain.WarehouseB/WarehouseService</reference>
+ <reference name="warehouse">supplychain.WarehouseC/WarehouseService</reference>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ </component>
+
+ <component name="supplychain.WarehouseA">
+ <implementation.composite name="supplychain.warehouse"/>
+ <reference name="manufacturer">supplychain.manufacturerA/ManufacturerService</reference>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ <property name="warehouseID">warehouseA</property>
+ </component>
+
+ <component name="supplychain.WarehouseB">
+ <implementation.composite name="supplychain.warehouse"/>
+ <reference name="manufacturer">supplychain.manufacturerB/ManufacturerService</reference>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ <property name="warehouseID">warehouseB</property>
+ </component>
+
+ <component name="supplychain.WarehouseC">
+ <implementation.composite name="supplychain.warehouse"/>
+ <reference name="manufacturer">supplychain.manufacturerA/ManufacturerService</reference>
+ <reference name="logging">supplychain.Logging/LoggingService</reference>
+ <property name="warehouseID">warehouseC</property>
+ </component>
+
+ <wire>
+ <source>supplychain.manufacturerA/callback</source>
+ <target>supplychain.WarehouseA/WarehouseCallbackService</target>
+ </wire>
+ <wire>
+ <source>supplychain.manufacturerB/callback</source>
+ <target>supplychain.WarehouseB/WarehouseCallbackService</target>
+ </wire>
+ <wire>
+ <source>supplychain.manufacturerC/callback</source>
+ <target>supplychain.WarehouseC/WarehouseCallbackService</target>
+ </wire>
+
+</composite>
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/samples/SupplyChain/supplychain.retailer.app.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org