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

5 files changed, 0 insertions, 167 deletions

diff --git a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
deleted file mode 100644
index 4305c3e185..0000000000
--- a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/CalculatorRestClient.rb
+++ /dev/null
@@ -1,25 +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.
-#
-#
-
-require("tuscany_sca_ruby")
-
-calculator = SCA::locateService("CalculatorService")
-
-x = calculator.div(5, 2)
-print "Retrieved result from RestCalculator service: ", x, "\n"
diff --git a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/Makefile.am b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/Makefile.am
deleted file mode 100644
index 5eee4677b8..0000000000
--- a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/Makefile.am
+++ /dev/null
@@ -1,23 +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)/RestCalculator/deploy
-restclientdir=$(deploydir)/sample.calculator.restclient
-
-restclient_DATA = *.rb *.composite
-restclient_SCRIPTS = runrestclient.sh
-EXTRA_DIST = runrestclient.sh *.rb *.composite
diff --git a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
deleted file mode 100644
index fb97ed8b74..0000000000
--- a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.bat
+++ /dev/null
@@ -1,50 +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%
-
-if "%LIBCURL_HOME%" == "" (
-echo LIBCURL_HOME not set
-goto end
-)
-echo using Libcurl installed at %LIBCURL_HOME%
-
-set PATH=%HTTPD_HOME%\bin;%LIBCURL_HOME%\lib;%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\extensions\rest\interface\bin;%TUSCANY_SCACPP%\extensions\rest\reference\bin;%TUSCANY_SCACPP%\extensions\rest\service\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%PATH%
-
-set TUSCANY_SCACPP_ROOT=%~d0%~p0\..\
-set TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorRestClientComponent
-set TUSCANY_SCACPP_BASE_URI=http://localhost:9090
-
-cd %TUSCANY_SCACPP_ROOT%\sample.calculator.restclient
-ruby -I%TUSCANY_SCACPP%\extensions\ruby\bin CalculatorRestClient.rb
-
-:end
-endlocal
diff --git a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
deleted file mode 100755
index 0c6c6c182c..0000000000
--- a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/runrestclient.sh
+++ /dev/null
@@ -1,41 +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/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
-
-export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
-export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorRestClientComponent
-export TUSCANY_SCACPP_BASE_URI=http://localhost:9090
-
-cd $TUSCANY_SCACPP_ROOT/sample.calculator.restclient
-ruby -I$TUSCANY_SCACPP/extensions/ruby/lib CalculatorRestClient.rb
diff --git a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite b/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
deleted file mode 100644
index fee8c6e14f..0000000000
--- a/sca-cpp/trunk/samples/RestCalculator/sample.calculator.restclient/sample.calculator.restclient.composite
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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.restclient">
-
-	<reference name="CalculatorService">
-		<binding.rest/>
-	</reference>
-
-</composite>
\ No newline at end of file