You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by aj...@apache.org on 2007/03/02 16:33:15 UTC

svn commit: r513813 - in /incubator/tuscany/cpp/sca: ./ doc/ doc/css/ samples/ samples/CppCalculator/ samples/PythonCalculator/ samples/PythonWeatherForecast/ samples/RestCalculator/ samples/RestCalculator/httpserver/conf/ samples/RestCalculator/sample...

Author: ajborley
Date: Fri Mar  2 07:33:14 2007
New Revision: 513813

URL: http://svn.apache.org/viewvc?view=rev&rev=513813
Log:
Various documentation updates

Added:
    incubator/tuscany/cpp/sca/doc/Axis2CWSExtension.html
      - copied unchanged from r512787, incubator/tuscany/cpp/sca/doc/Axis2CWSService.html
    incubator/tuscany/cpp/sca/doc/CppExtension.html
      - copied unchanged from r512787, incubator/tuscany/cpp/sca/doc/CPPComponents.html
    incubator/tuscany/cpp/sca/doc/RESTExtension.html   (with props)
    incubator/tuscany/cpp/sca/doc/SCAExtension.html   (with props)
Removed:
    incubator/tuscany/cpp/sca/doc/Axis2CWSService.html
    incubator/tuscany/cpp/sca/doc/CPPComponents.html
Modified:
    incubator/tuscany/cpp/sca/GettingStarted.html
    incubator/tuscany/cpp/sca/doc/css/maven-base.css
    incubator/tuscany/cpp/sca/samples/CppCalculator/README.html
    incubator/tuscany/cpp/sca/samples/GettingStarted.html
    incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html
    incubator/tuscany/cpp/sca/samples/PythonWeatherForecast/README.html
    incubator/tuscany/cpp/sca/samples/RestCalculator/README.html
    incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf
    incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
    incubator/tuscany/cpp/sca/samples/RubyCalculator/README
    incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html

Modified: incubator/tuscany/cpp/sca/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/GettingStarted.html?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/GettingStarted.html (original)
+++ incubator/tuscany/cpp/sca/GettingStarted.html Fri Mar  2 07:33:14 2007
@@ -166,13 +166,13 @@
                </TD>
             </TR>
             <TR CLASS="b">
-               <TD><STRONG>Optional:</STRONG> Axis2C Release 0.96</TD>
+               <TD><STRONG>Optional:</STRONG> Axis2/C Release 0.96</TD>
                <TD> 
                   <A HREF="http://ws.apache.org/axis2/c/download.cgi"
                      TARGET="_blank">http://ws.apache.org/axis2/c/download.cgi</A><BR/>
                   This is required for building and running the Tuscany SCA Web Service extension
                   (see <A HREF="#extensions">below</A>).
-                  Please download and follow the installation instructions. Ensure you can run the Axis2C samples                  
+                  Please download and follow the installation instructions. Ensure you can run the Axis2/C samples                  
                </TD>
             </TR>
             <TR CLASS="a">
@@ -214,7 +214,7 @@
               <LI>The following environment variables are required:                                 
                 <UL>
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.96&gt;</LI>
+                  <LI>AXIS2C_HOME=&lt;path to Axis2/C version 0.96&gt;</LI>
                 </UL></LI>
               <LI>The following environment variables are optional if you wish to build the Python or Ruby extensions
                   (see the <A HREF="doc/PythonExtension.html">Python extension</A> and 
@@ -259,7 +259,7 @@
               <LI>The following environment variables are required:                                 
                 <UL>
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.96&gt;</LI>
+                  <LI>AXIS2C_HOME=&lt;path to Axis2/C version 0.96&gt;</LI>
                 </UL></LI>
               <LI>The following environment variables are optional if you wish to build the Python or Ruby extensions
                   (see the <A HREF="doc/PythonExtension.html">Python extension</A> and 
@@ -302,13 +302,14 @@
                <TD><STRONG>Details</STRONG></TD>
             </TR>
             <TR CLASS="b">
-               <TD STYLE="vertical-align: top; white-space: nowrap;">C++ 
+               <TD STYLE="vertical-align: top; white-space: nowrap;">
+                <A HREF="doc/CppExtension.html">C++</A> 
                </TD>
                <TD>Provides the SCA C++ client API and enables C++ component implementations 
                 and interfaces. See the 
                 <A HREF="http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications">SCA 
                 C++ Client and Implementation specification</A> for more details about the SCA C++ 
-                Programming Model and the <A HREF="doc/CPPComponents.html">Creating C++ SCA Components</A> 
+                Programming Model and the <A HREF="doc/CppExtension.html#components">Creating C++ SCA Components</A> 
                 document for a step-by-step example.<BR/>
                 <STRONG>Requires:</STRONG>
                 <UL>
@@ -367,16 +368,18 @@
                </TD>
             </TR>
             <TR CLASS="b">
-               <TD STYLE="vertical-align: top; white-space: nowrap;">Axis2C Web Services</TD>
+               <TD STYLE="vertical-align: top; white-space: nowrap;">
+                <A HREF="doc/Axis2CWSExtension.html">Axis2/C Web Services</A>
+               </TD>
                <TD>Provides the Web Service bindings enabling Tuscany to call SCA references via
                 Web Services or expose SCA services as Web Services. See the 
                 <A HREF="http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications">SCA 
                 Web Service bindings specification</A> for more details about SCA Web Service support
-                and the <A HREF="doc/Axis2CWSService.html">Enabling Web Service 
+                and the <A HREF="doc/Axis2CWSExtension.html#service">Enabling Web Service 
                 access to SCA Components</A> document for a step-by-step example.<BR/> 
                 <STRONG>Requires:</STRONG>
                 <UL>
-                    <LI><A HREF="http://ws.apache.org/axis2/c/download.cgi" TARGET="_blank">Axis2C Release 0.96</A>
+                    <LI><A HREF="http://ws.apache.org/axis2/c/download.cgi" TARGET="_blank">Axis2/C Release 0.96</A>
                     - for building and running the extension.</LI>
                 </UL>
                </TD>
@@ -403,11 +406,11 @@
                </TD>
                <TD>Provides a default SCA binding enabling Tuscany to determine the appropriate technology
                 to use to provide services or invoke references. Currently this defaults to using the 
-                Axis2C Web Services binding. See the 
+                Axis2/C Web Services binding. See the 
                 <A HREF="doc/SCAExtension.html">SCA extension documentation</A> for more details.<BR/> 
                 <STRONG>Requires:</STRONG>
                 <UL>
-                    <LI><A HREF="doc/Axis2CWSService.html" TARGET="_blank">Axis2C Web Services extension</A>
+                    <LI><A HREF="doc/Axis2CWSExtension.html" TARGET="_blank">Axis2/C Web Services extension</A>
                     - for building and running the extension.</LI>
                 </UL>
                </TD>
@@ -446,7 +449,7 @@
             <TR CLASS="a">
                <TD STYLE="vertical-align: top; white-space: nowrap;"><A HREF="doc/Axis2CWSService.html">Enabling Web Service access to your Tuscany SCA component</A> 
                </TD>
-               <TD>A document that describes how to expose a Tuscany SCA C++ component as a Web Service via the Tuscany Axis2C Web Service support.
+               <TD>A document that describes how to expose a Tuscany SCA C++ component as a Web Service via the Tuscany Axis2/C Web Service support.
                </TD>
             </TR>
             <TR CLASS="a">

Added: incubator/tuscany/cpp/sca/doc/RESTExtension.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/RESTExtension.html?view=auto&rev=513813
==============================================================================
--- incubator/tuscany/cpp/sca/doc/RESTExtension.html (added)
+++ incubator/tuscany/cpp/sca/doc/RESTExtension.html Fri Mar  2 07:33:14 2007
@@ -0,0 +1,76 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
+<!--
+   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.
+-->
+
+<HTML>
+<HEAD>
+   <META CONTENT="text/html; charset=iso-8859-1" HTTP-EQUIV="Content-Type">
+   <META CONTENT="text/css" HTTP-EQUIV="Content-Style-Type">
+   <STYLE MEDIA="all" TYPE="text/css">
+@import url("css/maven-base.css");
+@import url("css/maven-theme.css");
+   </STYLE> 
+
+    <LINK HREF="css/maven-theme.css" MEDIA="print" REL="stylesheet"
+         TYPE="text/css">
+   <TITLE>Tuscany SCA Native - REST Extension</TITLE>
+</HEAD>
+
+<BODY>
+<DIV ID="bodyColumn"> 
+   <DIV ID="contentBox"> 
+      <DIV CLASS="section"> 
+         <H2>Tuscany SCA Native - REST Extension</H2> 
+
+         <P>This document describes the deployment and use of the REST  
+            (binding.rest) support in the Apache Tuscany SCA Native runtime.
+         </P>
+          TODO fix this doc!
+      </DIV>
+
+      <DIV CLASS="section"> 
+         <H2>Contents</H2> 
+         <OL>
+            <LI><A HREF="#deploy">Deploying the Tuscany REST service support to Apache HTTPD..</A></LI>
+         </OL>
+      </DIV>
+
+
+      <DIV CLASS="section"> 
+      </DIV>
+
+      <DIV CLASS="section"> 
+         <A NAME="help"><H2>Getting Help</H2></A>
+
+         <P>First place to look is at the Tuscany FAQ at 
+         <A HREF="http://incubator.apache.org/tuscany/faq.html"
+            TARGET="_blank">http://incubator.apache.org/tuscany/faq.html</A> </P>
+
+         <P>Any problem with this release can be reported to the Tuscany 
+         <A HREF="http://incubator.apache.org/tuscany/mail-lists.html"
+            TARGET="_blank">mailing lists</A> or create a JIRA issue at&nbsp;<A HREF="http://issues.apache.org/jira/browse/Tuscany"
+                                                                                TARGET="_blank">http://issues.apache.org/jira/browse/Tuscany</A>.</P>
+      </DIV>
+   </DIV>
+</DIV>
+</BODY>
+
+</HTML>
+

Propchange: incubator/tuscany/cpp/sca/doc/RESTExtension.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/doc/RESTExtension.html
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/cpp/sca/doc/RESTExtension.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: incubator/tuscany/cpp/sca/doc/SCAExtension.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/SCAExtension.html?view=auto&rev=513813
==============================================================================
--- incubator/tuscany/cpp/sca/doc/SCAExtension.html (added)
+++ incubator/tuscany/cpp/sca/doc/SCAExtension.html Fri Mar  2 07:33:14 2007
@@ -0,0 +1,76 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
+<!--
+   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.
+-->
+
+<HTML>
+<HEAD>
+   <META CONTENT="text/html; charset=iso-8859-1" HTTP-EQUIV="Content-Type">
+   <META CONTENT="text/css" HTTP-EQUIV="Content-Style-Type">
+   <STYLE MEDIA="all" TYPE="text/css">
+@import url("css/maven-base.css");
+@import url("css/maven-theme.css");
+   </STYLE> 
+
+    <LINK HREF="css/maven-theme.css" MEDIA="print" REL="stylesheet"
+         TYPE="text/css">
+   <TITLE>Tuscany SCA Native - SCA Extension</TITLE>
+</HEAD>
+
+<BODY>
+<DIV ID="bodyColumn"> 
+   <DIV ID="contentBox"> 
+      <DIV CLASS="section"> 
+         <H2>Tuscany SCA Native - SCA Extension</H2> 
+
+         <P>This document describes the deployment and use of the SCA  
+            binding support in the Apache Tuscany SCA Native runtime.
+         </P>
+          TODO fix this doc!
+      </DIV>
+
+      <DIV CLASS="section"> 
+         <H2>Contents</H2> 
+         <OL>
+            <LI></LI>
+         </OL>
+      </DIV>
+
+
+      <DIV CLASS="section"> 
+      </DIV>
+
+      <DIV CLASS="section"> 
+         <A NAME="help"><H2>Getting Help</H2></A>
+
+         <P>First place to look is at the Tuscany FAQ at 
+         <A HREF="http://incubator.apache.org/tuscany/faq.html"
+            TARGET="_blank">http://incubator.apache.org/tuscany/faq.html</A> </P>
+
+         <P>Any problem with this release can be reported to the Tuscany 
+         <A HREF="http://incubator.apache.org/tuscany/mail-lists.html"
+            TARGET="_blank">mailing lists</A> or create a JIRA issue at&nbsp;<A HREF="http://issues.apache.org/jira/browse/Tuscany"
+                                                                                TARGET="_blank">http://issues.apache.org/jira/browse/Tuscany</A>.</P>
+      </DIV>
+   </DIV>
+</DIV>
+</BODY>
+
+</HTML>
+

Propchange: incubator/tuscany/cpp/sca/doc/SCAExtension.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/cpp/sca/doc/SCAExtension.html
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/cpp/sca/doc/SCAExtension.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: incubator/tuscany/cpp/sca/doc/css/maven-base.css
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/css/maven-base.css?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/doc/css/maven-base.css (original)
+++ incubator/tuscany/cpp/sca/doc/css/maven-base.css Fri Mar  2 07:33:14 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-/* $Rev:$ $Date:$ */
+/* $Rev$ $Date$ */
 
 body {
   margin: 0px;
@@ -77,7 +77,7 @@
 }
 #bodyColumn {
   margin-right: 1.5em;
-  margin-left: 177px;
+  margin-left: 30px;
 }
 #legend {
   padding: 8px 0 8px 0;

Modified: incubator/tuscany/cpp/sca/samples/CppCalculator/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/CppCalculator/README.html?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/CppCalculator/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/CppCalculator/README.html Fri Mar  2 07:33:14 2007
@@ -37,10 +37,11 @@
 <DIV ID="bodyColumn"> 
    <DIV ID="contentBox"> 
       <DIV CLASS="section"> 
-         <H2>Tuscany SCA for C++ Samples - C++ Calculator Sample</H2> 
+         <H1>Tuscany SCA for C++ Samples - C++ Calculator Sample</H1> 
 
          <P>This is a very simple sample to show how an SCA composite can wire 
-          together two C++ components to implement a Calculator service.
+          together two C++ components to implement a Calculator service and invoke
+          the service via a local client.
          </P>
          <P>There are two sub projects in this workspace:</P>
          <UL>
@@ -63,14 +64,8 @@
          <OL>
             <LI><A HREF="#linuxbld">Building the C++ samples on Linux</A></LI>
             <LI><A HREF="#linuxrun">Running the C++ Calculator sample on Linux:</A></LI>
-               <UL>
-                  <LI><A HREF="#linuxbasic">Running the basic client</A></LI>
-               </UL>
             <LI><A HREF="#winbld">Building the C++ Calculator sample on Windows</A></LI>
             <LI><A HREF="#winrun">Running the C++ Calculator sample on Windows:</A></LI>
-               <UL>
-                  <LI><A HREF="#winbasic">Running the basic client</A></LI>
-               </UL>
             <LI><A HREF="#help">Getting help</A></LI>
          </OL>
       </DIV>
@@ -101,7 +96,6 @@
 
        <DIV CLASS="section"> 
          <A NAME="linuxrun"><H2>Running the C++ Calculator sample on Linux</H2></A>
-         <A NAME="linuxbasic"><H3>Calculator with basic client</H3></A>
          <OL>
              <LI>The following environment variables are required:                                 
                 <UL>
@@ -144,7 +138,6 @@
 
        <DIV CLASS="section"> 
          <A NAME="winrun"><H2>Running the C++ Calculator sample on Windows</H2></A>
-         <A NAME="winbasic"><H3>Calculator with basic client</H3></A>
          <OL>
              <LI>The following environment variables are required:                                 
                 <UL>

Modified: incubator/tuscany/cpp/sca/samples/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/GettingStarted.html?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/GettingStarted.html (original)
+++ incubator/tuscany/cpp/sca/samples/GettingStarted.html Fri Mar  2 07:33:14 2007
@@ -36,7 +36,7 @@
 <DIV ID="bodyColumn"> 
    <DIV ID="contentBox"> 
       <DIV CLASS="section"> 
-         <H2>Tuscany Samples - Getting Started - SCA Native Milestone release 3</H2> 
+         <H1>Tuscany Samples - Getting Started - SCA Native Milestone release 3</H1> 
 
          <P>Tuscany SCA Native includes a set of simple technology samples that demonstrates some of the functionality of
          the Tuscany SCA Native runtime. This page describes the samples and links to the documents that describe how to 
@@ -116,7 +116,7 @@
             <TR CLASS="a">
                <TD STYLE="vertical-align: top; white-space: nowrap;"><A HREF="RestYahoo/README.html">RestYahoo</A></TD>
                <TD>This sample demonstrates a Python component that is wired to make REST calls out to the external 
-                Yahoo! Web Search service</TD>
+                Yahoo! Web Search service. This sample uses a Ruby local client to invoke the Python component.</TD>
             </TR>
             <TR CLASS="a">
                <TD STYLE="vertical-align: top; white-space: nowrap;"><A HREF="AlertAggregator/README.html">AlertAggregator</A></TD>
@@ -131,19 +131,19 @@
       <DIV CLASS="section"> 
          <A NAME="samples"><H2>Sample Dependencies</H2></A>
          <P>The Tuscany samples each demonstrate different aspects of functionality provided by Tuscany, often in 
-          particular extensions. The table below documents the extension and container dependencies that each sample has. 
-          Please see the extension documentation for details on the dependencies that particular extensions require.
+          particular extensions. The table below documents the extension dependencies that each sample has. 
+          Please see the extension documentation for more details on the dependencies that particular extensions have.
          </P>
          <TABLE CLASS="bodyTable"> 
             <THEAD>
             <TR STYLE="vertical-align: top;">
                <TD></TD>
-               <TD><A HREF="../doc/CPPComponents.html">C++ Extension</A></TD>
+               <TD><A HREF="../doc/CppExtension.html">C++ Extension</A></TD>
                <TD><A HREF="../doc/PythonExtension.html">Python Extension</A></TD>
                <TD><A HREF="../doc/RubyExtension.html">Ruby Extension</A></TD>
                <TD><A HREF="../doc/PHPExtension.html">PHP Extension</A></TD>
-               <TD><A HREF="../doc/Axis2CWSService.html#service">Axis2C Web Service Service Extension</A></TD>
-               <TD><A HREF="../doc/Axis2CWSService.html#reference">Axis2C Web Service Reference Extension</A></TD>
+               <TD><A HREF="../doc/Axis2CWSExtension.html#service">Axis2C Web Service Service Extension</A></TD>
+               <TD><A HREF="../doc/Axis2CWSExtension.html#reference">Axis2C Web Service Reference Extension</A></TD>
                <TD><A HREF="../doc/RESTExtension.html#service">REST Service Extension</A></TD>
                <TD><A HREF="../doc/RESTExtension.html#reference">REST Reference Extension</A></TD>
                <TD><A HREF="../doc/RESTExtension.html#interface">REST Interface Extension</A></TD>
@@ -297,7 +297,7 @@
                <TD STYLE="vertical-align: top; white-space: nowrap;"><A HREF="RestYahoo/README.html">RestYahoo</A></TD>
                <TD></TD> <!-- C++ -->
                <TD>Yes</TD> <!-- Python -->
-               <TD></TD> <!-- Ruby -->
+               <TD>Yes</TD> <!-- Ruby -->
                <TD></TD> <!-- PHP -->
                <TD></TD> <!-- WS Service -->
                <TD></TD> <!-- WS Reference -->
@@ -481,7 +481,7 @@
                <TD STYLE="vertical-align: top; white-space: nowrap;"><A HREF="RestYahoo/README.html">RestYahoo</A></TD>
                <TD></TD> <!-- Java runtime -->
                <TD>Run</TD> <!--Python runtime -->
-               <TD></TD> <!--Ruby runtime -->
+               <TD>Run</TD> <!--Ruby runtime -->
                <TD></TD> <!--PHP runtime -->
                <TD></TD> <!--PHP SCA_SDO package -->
                <TD></TD> <!--Axis2/C library -->

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=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/PythonCalculator/README.html Fri Mar  2 07:33:14 2007
@@ -40,8 +40,8 @@
          <H1>Tuscany SCA for C++ Samples - Python Calculator Sample</H1> 
 
          <P>This is a very simple sample to show how an SCA composite can wire 
-          together two Python components to implement a Calculator service and expose 
-          that service as a Web Service. 
+          together two Python components to implement a Calculator service and invoke
+          the service via a local client. 
          </P>
          <P>See the <A HREF="../../doc/PythonExtension.html">Python extension</A> 
           documentation for information about building the Tuscany Python extension 

Modified: incubator/tuscany/cpp/sca/samples/PythonWeatherForecast/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonWeatherForecast/README.html?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PythonWeatherForecast/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/PythonWeatherForecast/README.html Fri Mar  2 07:33:14 2007
@@ -37,14 +37,18 @@
 <DIV ID="bodyColumn"> 
    <DIV ID="contentBox"> 
       <DIV CLASS="section"> 
-         <H2>Tuscany SCA for C++ Samples - PythonWeatherForecast Sample</H2> 
+         <H1>Tuscany SCA for C++ Samples - PythonWeatherForecast Sample</H1> 
 
          <P>This is a very simple sample to show how an SCA composite can wire 
           together two components to implement calls to a Weather Forecast web service. 
          </P>
-         <P>See the <A HREF="../../doc/PythonExtension.html">Python extension</A> 
-          documentation for information about building the Tuscany Python extension 
-          and using Python in SCA composites.
+         <P>The PythonWeatherForecast sample requires the following extensions:
+            <UL>
+               <LI><A HREF="../../doc/Axis2CWSExtension.html">Axis2/C Web Service Reference Extension</A></LI>
+               <LI><A HREF="../../doc/PythonExtension.html">Python Extension</A></LI>
+            </UL>
+            Please follow the documentation to ensure you have these extensions built and installed
+            on your system
          </P>
          <P>There are two sub projects in this workspace:</P>
          <UL>
@@ -66,28 +70,27 @@
       <DIV CLASS="section"> 
          <H2>Contents</H2> 
          <OL>
-            <LI><A HREF="#linuxbld">Building the Python samples on Linux</A></LI>
-            <LI><A HREF="#linuxrun">Running the WeatherForecast sample on Linux:</A></LI>
-            <LI><A HREF="#winbld">Building the WeatherForecast sample on Windows</A></LI>
-            <LI><A HREF="#winrun">Running the WeatherForecast sample on Windows:</A></LI>
+            <LI><A HREF="#linuxbld">Building the PythonWeatherForecast sample on Linux</A></LI>
+            <LI><A HREF="#linuxrun">Running the PythonWeatherForecast sample on Linux:</A></LI>
+            <LI><A HREF="#winbld">Building the PythonWeatherForecast sample on Windows</A></LI>
+            <LI><A HREF="#winrun">Running the PythonWeatherForecast sample on Windows:</A></LI>
             <LI><A HREF="#help">Getting help</A></LI>
          </OL>
       </DIV>
 
 
        <DIV CLASS="section"> 
-         <A NAME="linuxbld"><H2>Building the Python samples on Linux</H2></A>
+         <A NAME="linuxbld"><H2>Building the PythonWeatherForecast sample on Linux</H2></A>
          <P>If using the binary distribution the samples are built and installed in
             &lt;tuscany_sca_install_dir&gt;/samples - go directly to <A HREF="#linuxrun">Running the samples on Linux</A>.</P>
          <OL>
              <LI>The following environment variables are required:                                 
                 <UL>
-                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;                                      
-                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
-                </UL></LI>
+                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>
+                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>
+                </UL>
              </LI>
-             <LI>As the WeatherForecast sample is based on Python scripts, a specific compilation step is not necessary - 
+             <LI>As the PythonWeatherForecast sample is based on Python scripts, a specific compilation step is not necessary - 
                  only deployment is required. Deploy the Python samples only with the following command sequence:
                   <UL>
                       <LI>cd &lt;tuscany_sca_install_dir&gt;/samples</LI>
@@ -95,26 +98,33 @@
                       <LI>make install</LI>
                   </UL>
 	              NOTE: If you don't provide the --prefix configure option, it will by default install into
-                  /usr/local/tuscany/sca/samples/WeatherForecast</LI>
+                  /usr/local/tuscany/sca/samples/PythonWeatherForecast</LI>
          </OL>                                                  
         </DIV>
 
        <DIV CLASS="section"> 
-         <A NAME="linuxrun"><H2>Running the WeatherForecast sample on Linux</H2></A>
+         <A NAME="linuxrun"><H2>Running the PythonWeatherForecast sample on Linux</H2></A>
          <OL>
-             <LI>Ensure you have enabled the Tuscany Python extension. Follow the instructions 
-                 found <A HREF="../../doc/PythonExtension.html#linuxbin">here</A>.
+             <LI>The PythonWeatherForecast sample requires the following extensions:
+                <UL>
+                   <LI><A HREF="../../doc/Axis2CWSExtension.html">Axis2/C Web Service Reference Extension</A></LI>
+                   <LI><A HREF="../../doc/PythonExtension.html">Python Extension</A></LI>
+                </UL>
+                Please follow the documentation to ensure you have these extensions built and installed
+                on your system
              </LI>
              <LI>The following environment variables are required:                                 
                 <UL>
                   <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
+                  <LI>AXIS2C_HOME=&lt;path to Axis2/C version 0.96&gt;</LI>
+                  <LI>PYTHON_LIB=&lt;path to the Python library&gt;<BR/>
+                      Note: If you are using a default installation of Python 2.5 this is usually /usr/lib</LI>
                 </UL>
              </LI>
              <LI>Run the sample with the following commands:
                 <UL>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/WeatherForecast/deploy/sample.weather.client</LI>
+                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/PythonWeatherForecast/deploy/sample.weather.client</LI>
                    <LI>./runclient.sh</LI>
                 </UL>
              </LI>
@@ -122,7 +132,7 @@
         </DIV>
 
         <DIV CLASS="section">
-         <A NAME="winbld"><H2>Building the WeatherForecast sample on Windows</H2></A>
+         <A NAME="winbld"><H2>Building the PythonWeatherForecast sample on Windows</H2></A>
          <P>If using the binary distribution the samples are built and installed in
             &lt;tuscany_sca_install_dir&gt;\samples - go directly to <A HREF="#winrun">Running the samples on Windows</A>.</P>
          <OL>
@@ -130,13 +140,12 @@
                 <UL>
                   <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;                                      
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
                 </UL></LI>
              </LI>
              <LI>As this sample is based on Python scripts, a specific compilation step is not necessary - 
                  only deployment is required. Deploy the sample with the following commands:
                  <UL>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\WeatherForecast</LI>
+                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\PythonWeatherForecast</LI>
                    <LI>deploy.bat</LI>
                 </UL>
              </LI>
@@ -144,21 +153,26 @@
         </DIV>
 
        <DIV CLASS="section"> 
-         <A NAME="winrun"><H2>Running the WeatherForecast sample on Windows</H2></A>
+         <A NAME="winrun"><H2>Running the PythonWeatherForecast sample on Windows</H2></A>
          <OL>
-             <LI>Ensure you have enabled the Tuscany Python extension. Follow the instructions 
-                 found <A HREF="../../doc/PythonExtension.html#winbin">here</A>.
+             <LI>The PythonWeatherForecast sample requires the following extensions:
+                <UL>
+                   <LI><A HREF="../../doc/Axis2CWSExtension.html">Axis2/C Web Service Reference Extension</A></LI>
+                   <LI><A HREF="../../doc/PythonExtension.html">Python Extension</A></LI>
+                </UL>
+                Please follow the documentation to ensure you have these extensions built and installed
+                on your system
              </LI>
              <LI>The following environment variables are required:                                 
                 <UL>
                   <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
+                  <LI>AXIS2C_HOME=&lt;path to Axis2/C version 0.96&gt;</LI>
                 </UL>
              </LI>
              <LI>Run the sample with the following commands:
                 <UL>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\WeatherForecast\deploy\sample.weather.client</LI>
+                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\PythonWeatherForecast\deploy\sample.weather.client</LI>
                    <LI>runclient.bat</LI>
                 </UL>
              </LI>

Modified: incubator/tuscany/cpp/sca/samples/RestCalculator/README.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCalculator/README.html?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCalculator/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/RestCalculator/README.html Fri Mar  2 07:33:14 2007
@@ -37,25 +37,31 @@
 <DIV ID="bodyColumn"> 
    <DIV ID="contentBox"> 
       <DIV CLASS="section"> 
-         <H2>Tuscany SCA for C++ Samples - REST Calculator Sample</H2> 
-
-         <P>TODO update this doc???
+         <H1>Tuscany SCA for C++ Samples - REST Calculator Sample</H1> 
+         
          <P>This is a very simple sample to show how an SCA composite can wire 
           together two Ruby components to implement a Calculator service and expose 
-          that service as a Web Service.
+          that service as a REST Service running under Apache HTTPD.
          </P>
+         <P>The REST Calculator sample requires the following extensions:
+            <UL>
+               <LI><A HREF="../../doc/RestExtension.html">REST Service & Reference Extensions</A></LI>
+               <LI><A HREF="../../doc/RubyExtension.html">Ruby Extension</A></LI>
+            </UL>
+            Please follow the documentation to ensure you have these extensions built and installed
+            on your system</P>
          <P>There are three sub projects in this workspace:</P>
          <UL>
             <LI>sample.calculator<BR/>
                 This contains the Ruby scripts and SCDL artifacts for the SCA Calculator 
                 composite implementing the sample Calculator.
             </LI>
-            <LI>sample.calculator.client<BR/>
+            <LI>sample.calculator.restclient<BR/>
                 A sample client which does a local call to the Calculator service.
             </LI>
-            <LI>sample.calculator.wsclient<BR/>
-                A sample client which does a local call to a composite that contains a Web Service reference
-                that calls the Calculator Web Service.
+            <LI>httpserver<BR/>
+                A minimal configuration for the Apache HTTP server used to host the 
+                REST service as well as scripts to start and stop the server.
             </LI>
          </UL>
          <P>Additionally, there is the sample.calculator.app.composite file. This     
@@ -67,34 +73,25 @@
       <DIV CLASS="section"> 
          <H2>Contents</H2> 
          <OL>
-            <LI><A HREF="#linuxbld">Building the Ruby samples on Linux</A></LI>
+            <LI><A HREF="#linuxbld">Building the REST Calculator sample on Linux</A></LI>
             <LI><A HREF="#linuxrun">Running the REST Calculator sample on Linux:</A></LI>
-               <UL>
-                  <LI><A HREF="#linuxbasic">Running the basic client</A></LI>
-                  <LI><A HREF="#linuxws">Running the Web Service client</A></LI>
-               </UL>
             <LI><A HREF="#winbld">Building the REST Calculator sample on Windows</A></LI>
             <LI><A HREF="#winrun">Running the REST Calculator sample on Windows:</A></LI>
-               <UL>
-                  <LI><A HREF="#winbasic">Running the basic client</A></LI>
-                  <LI><A HREF="#winws">Running the Web Service client</A></LI>
-               </UL>
             <LI><A HREF="#help">Getting help</A></LI>
          </OL>
       </DIV>
 
 
        <DIV CLASS="section"> 
-         <A NAME="linuxbld"><H2>Building the Ruby samples on Linux</H2></A>
+         <A NAME="linuxbld"><H2>Building the REST Calculator sample on Linux</H2></A>
          <P>If using the binary distribution the samples are built and installed in
             &lt;tuscany_sca_install_dir&gt;/samples - go directly to <A HREF="#linuxrun">Running the samples on Linux</A>.</P>
          <OL>
              <LI>The following environment variables are required:                                 
                 <UL>
-                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;                                      
-                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
-                </UL></LI>
+                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>
+                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>
+                </UL>
              </LI>
              <LI>As the REST Calculator sample is based on Ruby scripts, a specific compilation step is not necessary - 
                  only deployment is required. Deploy the Ruby samples only with the following command sequence:
@@ -110,55 +107,41 @@
 
        <DIV CLASS="section"> 
          <A NAME="linuxrun"><H2>Running the REST Calculator sample on Linux</H2></A>
-         <A NAME="linuxbasic"><H3>Calculator with basic client</H3></A>
          <OL>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#linuxbin">here</A>.
-             </LI>
-             <LI>The following environment variables are required:                                 
+             <LI>The REST Calculator sample requires the following extensions:
                 <UL>
-                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
-                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
+                   <LI><A HREF="../../doc/RestExtension.html">REST Service & Reference Extensions</A></LI>
+                   <LI><A HREF="../../doc/RubyExtension.html">Ruby Extension</A></LI>
                 </UL>
+                 Please follow the documentation to ensure you have these extensions built and installed
+                 on your system
              </LI>
-             <LI>Run the sample with the following commands:
-                <UL>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/RestCalculator/deploy/sample.calculator.client</LI>
-                   <LI>./runclient.sh</LI>
-                </UL>
-             </LI>
-         </OL>                                                  
-         <A NAME="linuxws"><H3>Calculator with Web Service client</H3></A>
-         <OL>
-             <LI>Ensure you have enabled Axis2C to run Tuscany SCA services. Follow the instructions 
-                 found <A HREF="../../doc/Axis2CWSService.html">here</A>.
-             </LI>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#linuxbin">here</A>.
-             </LI>
-             <LI>Start the Axis2C simple http server:
+             <LI>Start the HTTPD server:
                 <OL>
                    <LI>The following environment variables are required:                                 
                       <UL>
                         <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
                         <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
                       </UL>
                    </LI>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/RestCalculator/deploy/sample.calculator</LI>
-                   <LI>./runwsserver.sh</LI>
+                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/RestCalculator/deploy/httpserver</LI>
+                   <LI>./startserver.sh<BR/>
+                       NOTE: Depending on your installation of Apache HTTPD you may need to log in as root before following 
+                       these steps. If so, you may also need to uncomment the User and Group directives in the
+                       &lt;tuscany_sca_install_dir&gt;/samples/RestCalculator/deploy/httpserver/conf/httpd.conf file
+                       and set these to the appropriate username and group that the server should run as</LI>                   
                 </OL>
              </LI>
              <LI>Run the client:
                 <OL>
-                   <LI>The following environment variable is required:                                 
+                   <LI>The following environment variables are required:                                 
                       <UL>
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
+                        <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
+                        <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
                       </UL>
                    </LI>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/RestCalculator/deploy/sample.calculator.wsclient</LI>
-                   <LI>./runwsclient.sh</LI>
+                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/RestCalculator/deploy/sample.calculator.restclient</LI>
+                   <LI>./runrestclient.sh</LI>
                 </OL>
              </LI>
          </OL>                                                  
@@ -173,7 +156,6 @@
                 <UL>
                   <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;                                      
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
                 </UL></LI>
              </LI>
              <LI>As this sample is based on Ruby scripts, a specific compilation step is not necessary - 
@@ -188,44 +170,26 @@
 
        <DIV CLASS="section"> 
          <A NAME="winrun"><H2>Running the REST Calculator sample on Windows</H2></A>
-         <A NAME="winbasic"><H3>Calculator with basic client</H3></A>
          <OL>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#winbin">here</A>.
-             </LI>
-             <LI>The following environment variables are required:                                 
+             <LI>The REST Calculator sample requires the following extensions:
                 <UL>
-                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
-                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
+                   <LI><A HREF="../../doc/RestExtension.html">REST Service & Reference Extensions</A></LI>
+                   <LI><A HREF="../../doc/RubyExtension.html">Ruby Extension</A></LI>
                 </UL>
+                 Please follow the documentation to ensure you have these extensions built and installed
+                 on your system
              </LI>
-             <LI>Run the sample with the following commands:
-                <UL>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\RestCalculator\deploy\sample.calculator.client</LI>
-                   <LI>runclient.bat</LI>
-                </UL>
-             </LI>
-         </OL>                                                  
-         <A NAME="winws"><H3>Calculator with Web Service client</H3></A>
-         <OL>
-             <LI>Ensure you have enabled Axis2C to run Tuscany SCA services. Follow the instructions 
-                 found <A HREF="../../doc/Axis2CWSService.html">here</A>.
-             </LI>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#winbin">here</A>.
-             </LI>
-             <LI>Start the Axis2C simple http server:
+             <LI>Start the HTTPD server:
                 <OL>
                    <LI>The following environment variables are required:                                 
                       <UL>
                         <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
                         <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
+                        <LI>HTTPD_HOME=&lt;path to installed Apache HTTPD server&gt;</LI>
                       </UL>
                    </LI>
                    <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\RestCalculator\deploy\sample.calculator</LI>
-                   <LI>runwsserver.bat</LI>
+                   <LI>startserver.bat</LI>
                 </OL>
              </LI>
              <LI>Run the client:
@@ -234,11 +198,11 @@
                       <UL>
                         <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
                         <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
+                        <LI>LIBCURL_HOME=&lt;path to installed libcurl libraries&gt;</LI>
                       </UL>
                    </LI>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\RestCalculator\deploy\sample.calculator.wsclient</LI>
-                   <LI>runwsclient.bat</LI>
+                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\RestCalculator\deploy\sample.calculator.restclient</LI>
+                   <LI>runrestclient.bat</LI>
                 </OL>
              </LI>
          </OL>                                                  

Modified: incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf (original)
+++ incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf Fri Mar  2 07:33:14 2007
@@ -25,3 +25,10 @@
 Include conf/base.conf
 Include conf/tuscany_sca_mod_rest.conf
 
+# User and Group directives may be required if the server must be 
+# started from the root account. Uncomment the following lines and
+# set the correct username and group
+#
+# User myusername
+# Group mygroupname
+

Modified: incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh (original)
+++ incubator/tuscany/cpp/sca/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh Fri Mar  2 07:33:14 2007
@@ -31,7 +31,7 @@
 fi
 echo "Using SDO installed at $TUSCANY_SDOCPP"
 
-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.CalculatorRestClientComponent

Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/README?view=diff&rev=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/README (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/README Fri Mar  2 07:33:14 2007
@@ -5,16 +5,13 @@
 two components to implement a Calculator service and expose that service as
 a Web Service.
 
-There are three sub projects in this workspace:
+There are two sub projects in this workspace:
     - sample.calculator
       This contains the source code and SCDL artifacts for the SCA Calculator.
       composite implementing the sample Calculator.
 
     - sample.calculator.client
       A sample client which does a local call to the Calculator service.
-
-    - sample.calculator.wsclient
-      A sample Axis2 Web Service client which calls the Calculator Web service.
 
 Additionally, there is the sample.calculator.app.composite file. This 
 describes the configuration of the SCA Calculator composite deployed to the 

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=513813&r1=513812&r2=513813
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html (original)
+++ incubator/tuscany/cpp/sca/samples/RubyCalculator/README.html Fri Mar  2 07:33:14 2007
@@ -40,10 +40,10 @@
          <H2>Tuscany SCA for C++ Samples - Ruby Calculator Sample</H2> 
 
          <P>This is a very simple sample to show how an SCA composite can wire 
-          together two Ruby components to implement a Calculator service and expose 
-          that service as a Web Service.
+          together two Ruby components to implement a Calculator service and invoke
+          the service via a local client.
          </P>
-         <P>There are three sub projects in this workspace:</P>
+         <P>There are two sub projects in this workspace:</P>
          <UL>
             <LI>sample.calculator<BR/>
                 This contains the Ruby scripts and SCDL artifacts for the SCA Calculator 
@@ -52,10 +52,6 @@
             <LI>sample.calculator.client<BR/>
                 A sample client which does a local call to the Calculator service.
             </LI>
-            <LI>sample.calculator.wsclient<BR/>
-                A sample client which does a local call to a composite that contains a Web Service reference
-                that calls the Calculator Web Service.
-            </LI>
          </UL>
          <P>Additionally, there is the sample.calculator.app.composite file. This     
             describes the configuration of the SCA Calculator composite deployed to the SCA
@@ -68,16 +64,8 @@
          <OL>
             <LI><A HREF="#linuxbld">Building the Ruby samples on Linux</A></LI>
             <LI><A HREF="#linuxrun">Running the Ruby Calculator sample on Linux:</A></LI>
-               <UL>
-                  <LI><A HREF="#linuxbasic">Running the basic client</A></LI>
-                  <LI><A HREF="#linuxws">Running the Web Service client</A></LI>
-               </UL>
             <LI><A HREF="#winbld">Building the Ruby Calculator sample on Windows</A></LI>
             <LI><A HREF="#winrun">Running the Ruby Calculator sample on Windows:</A></LI>
-               <UL>
-                  <LI><A HREF="#winbasic">Running the basic client</A></LI>
-                  <LI><A HREF="#winws">Running the Web Service client</A></LI>
-               </UL>
             <LI><A HREF="#help">Getting help</A></LI>
          </OL>
       </DIV>
@@ -92,7 +80,6 @@
                 <UL>
                   <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;                                      
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
                 </UL></LI>
              </LI>
              <LI>As the Ruby Calculator sample is based on Ruby scripts, a specific compilation step is not necessary - 
@@ -109,16 +96,11 @@
 
        <DIV CLASS="section"> 
          <A NAME="linuxrun"><H2>Running the Ruby Calculator sample on Linux</H2></A>
-         <A NAME="linuxbasic"><H3>Calculator with basic client</H3></A>
          <OL>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#linuxbin">here</A>.
-             </LI>
              <LI>The following environment variables are required:                                 
                 <UL>
                   <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
                 </UL>
              </LI>
              <LI>Run the sample with the following commands:
@@ -128,39 +110,6 @@
                 </UL>
              </LI>
          </OL>                                                  
-         <A NAME="linuxws"><H3>Calculator with Web Service client</H3></A>
-         <OL>
-             <LI>Ensure you have enabled Axis2C to run Tuscany SCA services. Follow the instructions 
-                 found <A HREF="../../doc/Axis2CWSService.html">here</A>.
-             </LI>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#linuxbin">here</A>.
-             </LI>
-             <LI>Start the Axis2C simple http server:
-                <OL>
-                   <LI>The following environment variables are required:                                 
-                      <UL>
-                        <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
-                        <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
-                      </UL>
-                   </LI>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/RubyCalculator/deploy/sample.calculator</LI>
-                   <LI>./runwsserver.sh</LI>
-                </OL>
-             </LI>
-             <LI>Run the client:
-                <OL>
-                   <LI>The following environment variable is required:                                 
-                      <UL>
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
-                      </UL>
-                   </LI>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;/samples/RubyCalculator/deploy/sample.calculator.wsclient</LI>
-                   <LI>./runwsclient.sh</LI>
-                </OL>
-             </LI>
-         </OL>                                                  
         </DIV>
 
         <DIV CLASS="section">
@@ -170,10 +119,9 @@
          <OL>
              <LI>The following environment variables are required:                                 
                 <UL>
-                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;                                      
-                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
-                </UL></LI>
+                  <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>
+                  <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>
+                </UL>
              </LI>
              <LI>As this sample is based on Ruby scripts, a specific compilation step is not necessary - 
                  only deployment is required. Deploy the sample with the following commands:
@@ -187,16 +135,11 @@
 
        <DIV CLASS="section"> 
          <A NAME="winrun"><H2>Running the Ruby Calculator sample on Windows</H2></A>
-         <A NAME="winbasic"><H3>Calculator with basic client</H3></A>
          <OL>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#winbin">here</A>.
-             </LI>
              <LI>The following environment variables are required:                                 
                 <UL>
                   <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
                   <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                  <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
                 </UL>
              </LI>
              <LI>Run the sample with the following commands:
@@ -206,44 +149,7 @@
                 </UL>
              </LI>
          </OL>                                                  
-         <A NAME="winws"><H3>Calculator with Web Service client</H3></A>
-         <OL>
-             <LI>Ensure you have enabled Axis2C to run Tuscany SCA services. Follow the instructions 
-                 found <A HREF="../../doc/Axis2CWSService.html">here</A>.
-             </LI>
-             <LI>Ensure you have enabled the Tuscany Ruby extension. Follow the instructions 
-                 found <A HREF="../../doc/RubyExtension.html#winbin">here</A>.
-             </LI>
-             <LI>Start the Axis2C simple http server:
-                <OL>
-                   <LI>The following environment variables are required:                                 
-                      <UL>
-                        <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
-                        <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
-                      </UL>
-                   </LI>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\RubyCalculator\deploy\sample.calculator</LI>
-                   <LI>runwsserver.bat</LI>
-                </OL>
-             </LI>
-             <LI>Run the client:
-                <OL>
-                   <LI>The following environment variables are required:                                 
-                      <UL>
-                        <LI>TUSCANY_SCACPP=&lt;path to installed Tuscany SCA&gt;</LI>                                      
-                        <LI>TUSCANY_SDOCPP=&lt;path to installed Tuscany SDO&gt;</LI>                                      
-                        <LI>AXIS2C_HOME=&lt;path to axis2c version 0.94&gt;</LI>
-                      </UL>
-                   </LI>
-                   <LI>cd &lt;tuscany_sca_install_dir&gt;\samples\RubyCalculator\deploy\sample.calculator.wsclient</LI>
-                   <LI>runwsclient.bat</LI>
-                </OL>
-             </LI>
-         </OL>                                                  
       </DIV>
-
-
               
       <DIV CLASS="section"> 
          <A NAME="help"><H2>Getting Help</H2></A>



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