From fe9add6a09e833eb836325992571e1a874c18b18 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 27 Dec 2010 05:59:24 +0000 Subject: Simplify relay sample a bit. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1053003 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/samples/relay-python/Makefile.am | 2 +- .../samples/relay-python/htdocs/test/index.html | 21 ------------------ sca-cpp/trunk/samples/relay-python/html.py | 22 ------------------- sca-cpp/trunk/samples/relay-python/json.py | 24 --------------------- sca-cpp/trunk/samples/relay-python/relay.composite | 12 +++++------ sca-cpp/trunk/samples/relay-python/relay.py | 21 ++++++++++++++++++ sca-cpp/trunk/samples/relay-python/rss.py | 25 ---------------------- sca-cpp/trunk/samples/relay-python/xml.py | 24 --------------------- 8 files changed, 28 insertions(+), 123 deletions(-) delete mode 100644 sca-cpp/trunk/samples/relay-python/htdocs/test/index.html delete mode 100644 sca-cpp/trunk/samples/relay-python/html.py delete mode 100644 sca-cpp/trunk/samples/relay-python/json.py create mode 100644 sca-cpp/trunk/samples/relay-python/relay.py delete mode 100644 sca-cpp/trunk/samples/relay-python/rss.py delete mode 100644 sca-cpp/trunk/samples/relay-python/xml.py (limited to 'sca-cpp/trunk') diff --git a/sca-cpp/trunk/samples/relay-python/Makefile.am b/sca-cpp/trunk/samples/relay-python/Makefile.am index 4e357eb330..57938aff69 100644 --- a/sca-cpp/trunk/samples/relay-python/Makefile.am +++ b/sca-cpp/trunk/samples/relay-python/Makefile.am @@ -20,6 +20,6 @@ if WANT_PYTHON dist_sample_SCRIPTS = start stop sampledir = $(prefix)/samples/relay-python -nobase_dist_sample_DATA = html.py json.py xml.py rss.py relay.composite htdocs/*.html htdocs/test/*.html +nobase_dist_sample_DATA = relay.py relay.composite htdocs/*.html endif diff --git a/sca-cpp/trunk/samples/relay-python/htdocs/test/index.html b/sca-cpp/trunk/samples/relay-python/htdocs/test/index.html deleted file mode 100644 index 1bfb3e30c2..0000000000 --- a/sca-cpp/trunk/samples/relay-python/htdocs/test/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - -

It works!

- diff --git a/sca-cpp/trunk/samples/relay-python/html.py b/sca-cpp/trunk/samples/relay-python/html.py deleted file mode 100644 index 87a94a35ba..0000000000 --- a/sca-cpp/trunk/samples/relay-python/html.py +++ /dev/null @@ -1,22 +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. - -# Content relay implementation -def get(id, target): - #return ("text/plain", ("It works!",)) - return target.get(id) - diff --git a/sca-cpp/trunk/samples/relay-python/json.py b/sca-cpp/trunk/samples/relay-python/json.py deleted file mode 100644 index 24f969d419..0000000000 --- a/sca-cpp/trunk/samples/relay-python/json.py +++ /dev/null @@ -1,24 +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. - -# Relay implementation -import uuid -import sys - -def get(id, target): - return target.get(id) - diff --git a/sca-cpp/trunk/samples/relay-python/relay.composite b/sca-cpp/trunk/samples/relay-python/relay.composite index 2f5b92dee0..7f7302955e 100644 --- a/sca-cpp/trunk/samples/relay-python/relay.composite +++ b/sca-cpp/trunk/samples/relay-python/relay.composite @@ -23,7 +23,7 @@ name="relay"> - + @@ -33,7 +33,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -53,17 +53,17 @@ - + - + - + diff --git a/sca-cpp/trunk/samples/relay-python/relay.py b/sca-cpp/trunk/samples/relay-python/relay.py new file mode 100644 index 0000000000..5fe99803c1 --- /dev/null +++ b/sca-cpp/trunk/samples/relay-python/relay.py @@ -0,0 +1,21 @@ +# 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. + +# Relay implementation +def get(id, target): + return target.get(id) + diff --git a/sca-cpp/trunk/samples/relay-python/rss.py b/sca-cpp/trunk/samples/relay-python/rss.py deleted file mode 100644 index 96e4491c1a..0000000000 --- a/sca-cpp/trunk/samples/relay-python/rss.py +++ /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. - -import sys - -# Feed relay implementation -def get(id, target): - v = target.get(id) - print >> sys.stderr, v - return v - diff --git a/sca-cpp/trunk/samples/relay-python/xml.py b/sca-cpp/trunk/samples/relay-python/xml.py deleted file mode 100644 index 24f969d419..0000000000 --- a/sca-cpp/trunk/samples/relay-python/xml.py +++ /dev/null @@ -1,24 +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. - -# Relay implementation -import uuid -import sys - -def get(id, target): - return target.get(id) - -- cgit v1.2.3