Simplified the automake build using configure options instead of environment variables and cleaned up some of the makefile.am files. Adjusted build instructions. Moved directories that don't yet build or work out of the main build dir and obsolete docs to a contrib dir.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@883254 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 0 insertions, 271 deletions

diff --git a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
deleted file mode 100644
index 37e9d40f66..0000000000
--- a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/CalculatorClient.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * 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.
- */
-
-/* $Rev$ $Date$ */
-
-#include <iostream>
-#include <stdlib.h>
-
-#include "osoa/sca/sca.h"
-
-#include "Calculator.h"
-
-using namespace std;
-using namespace osoa::sca;
-
-
-void usage();
-bool IsNumber(const char *p);
-
-int main(int argc, char* argv[])
-{
-    const char *operation;
-    float arg1 = 0;
-    float arg2 = 0;
-	
-    if (argc == 4)
-    {
-        operation = argv[1];
-		
-        if (!IsNumber(argv[2]))
-        {
-            cout << "calculator_client: Argument 1 is not a number" << endl;
-			usage();
-        }
-        else
-        {
-            arg1 = atof(argv[2]);
-        }
-
-        if (!IsNumber(argv[3]))
-        {
-            cout << "calculator_client: Argument 2 is not a number" << endl;
-			usage();
-        }
-        else
-        {
-            arg2 = atof(argv[3]);
-        }
-    }
-    else
-    {
-        usage();
-    }
-
-    try
-    {
-        // Locate a service
-		CompositeContext myContext = CompositeContext::getCurrent();
-		Calculator *calcService = (Calculator*) myContext.locateService("CalculatorComponent/CalculatorService");
-		if (calcService == 0)
-		{
-			cout << "calculator_client: Unable to find Calculator service" << endl;
-		}
-		else
-		{
-            float result = 0;
-            if (strcmp(operation, "add") == 0)
-            {
-                result = calcService->add(arg1, arg2);
-                cout << "calculator_client: add(" << arg1 << "," << arg2 << ") = " << result << endl;
-            }
-            else
-            if (strcmp(operation, "sub") == 0)
-            {
-                result = calcService->sub(arg1, arg2);
-                cout << "calculator_client: sub(" << arg1 << "," << arg2 << ") = " << result << endl;
-            }
-            else
-            if (strcmp(operation, "mul") == 0)
-            {
-                result = calcService->mul(arg1, arg2);
-                cout << "calculator_client: mul(" << arg1 << "," << arg2 << ") = " << result << endl;
-            }
-            else
-            if (strcmp(operation, "div") == 0)
-            {
-                result = calcService->div(arg1, arg2);
-                cout << "calculator_client: div(" << arg1 << "," << arg2 << ") = " << result << endl;
-            }
-			else
-		    {
-		        cout << "calculator_client: Unrecognized operation: " << operation << endl;
-			}
-		}
-	}
-	catch (ServiceRuntimeException& ex)
-	{
-        cout << "calculator_client: exception caught: " << ex << endl;
-	}
-	return 0;
-}
-
-void usage()
-{
-   cout << "Usage: calculator_client add|sub|mul|div arg1 arg2" << endl;
-   exit(1);
-}
-
-bool IsNumber (const char *p)
-{
-    int len = strlen(p);
-    int pointcount = 0;
-
-    if (!isdigit (p[0]) && p[0] != '-' && p[0] != '+')
-    {
-        return false;
-    }
-    for (int i = 1; i < len; i++)
-    {
-	   if (!isdigit (p[i]))
-       {
-           if (p[i] == '.')
-           {
-               if (pointcount > 0) return false;
-               pointcount++;
-           }
-           else
-           {
-                return false;
-           }
-       }
-    }
-    return true;
-}
diff --git a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/Makefile.am b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/Makefile.am
deleted file mode 100644
index 9782bf5041..0000000000
--- a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-#  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.
-
-deploydir=$(prefix)/CppCalculator/deploy
-clientdir=$(deploydir)/sample.calculator.client
-
-client_PROGRAMS = calculator_client
-client_SCRIPTS = runclient.sh
-EXTRA_DIST = runclient.sh
-
-calculator_client_SOURCES = \
-CalculatorClient.cpp
-
-calculator_client_LDADD = \
--L${TUSCANY_SCACPP}/lib \
-  -ltuscany_sca \
--L${TUSCANY_SCACPP}/extensions/cpp/lib \
-  -ltuscany_sca_cpp \
--L${TUSCANY_SDOCPP}/lib \
-  -ltuscany_sdo
-	
-INCLUDES = \
--I$(TUSCANY_SCACPP)/extensions/cpp/include \
--I${TUSCANY_SCACPP}/include \
--I${TUSCANY_SDOCPP}/include \
--I../sample.calculator
diff --git a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.bat b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.bat
deleted file mode 100644
index 795325ab52..0000000000
--- a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.bat
+++ /dev/null
@@ -1,42 +0,0 @@
-@echo off
-
-@REM  Licensed to the Apache Software Foundation (ASF) under one
-@REM  or more contributor license agreements.  See the NOTICE file
-@REM  distributed with this work for additional information
-@REM  regarding copyright ownership.  The ASF licenses this file
-@REM  to you under the Apache License, Version 2.0 (the
-@REM  "License"); you may not use this file except in compliance
-@REM  with the License.  You may obtain a copy of the License at
-@REM  
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM    
-@REM  Unless required by applicable law or agreed to in writing,
-@REM  software distributed under the License is distributed on an
-@REM  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM  KIND, either express or implied.  See the License for the
-@REM  specific language governing permissions and limitations
-@REM  under the License.
-
-setlocal
-
-if "%TUSCANY_SCACPP%" == "" (
-echo "TUSCANY_SCACPP not set"
-goto end
-)
-echo using SCA installed at %TUSCANY_SCACPP%
-
-if "%TUSCANY_SDOCPP%" == "" (
-echo "TUSCANY_SDOCPP not set"
-goto end
-)
-echo using SDO installed at %TUSCANY_SDOCPP%
-
-set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SCACPP%\extensions\cpp\bin;%TUSCANY_SDOCPP%\bin;%PATH%
-
-set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
-
-.\calculator_client.exe div 5 2
-
-:end
-endlocal
diff --git a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.sh b/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.sh
deleted file mode 100755
index feae29d557..0000000000
--- a/sca-cpp/trunk/samples/CppCalculator/sample.calculator.client/runclient.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-#  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.
-
-APFULLDIR=`pwd`
-
-if [ x$TUSCANY_SCACPP = x ]; then
-echo "TUSCANY_SCACPP not set"
-exit;
-fi
-echo "Using SCA installed at $TUSCANY_SCACPP"
-
-if [ x$TUSCANY_SDOCPP = x ]; then
-echo "TUSCANY_SDOCPP not set"
-exit;
-fi
-echo "Using SDO installed at $TUSCANY_SDOCPP"
-
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
-
-export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
-export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
-
-./calculator_client div 5 2