svn commit: r1053003 - in /tuscany/sca-cpp/trunk/samples/relay-python: Makefile.am htdocs/test/ html.py json.py relay.composite relay.py rss.py xml.py

[js...@apache.org]

Author: jsdelfino
Date: Mon Dec 27 05:59:24 2010
New Revision: 1053003

URL: http://svn.apache.org/viewvc?rev=1053003&view=rev
Log:
Simplify relay sample a bit.

Added:
    tuscany/sca-cpp/trunk/samples/relay-python/relay.py
      - copied, changed from r1053002, tuscany/sca-cpp/trunk/samples/relay-python/xml.py
Removed:
    tuscany/sca-cpp/trunk/samples/relay-python/htdocs/test/
    tuscany/sca-cpp/trunk/samples/relay-python/html.py
    tuscany/sca-cpp/trunk/samples/relay-python/json.py
    tuscany/sca-cpp/trunk/samples/relay-python/rss.py
    tuscany/sca-cpp/trunk/samples/relay-python/xml.py
Modified:
    tuscany/sca-cpp/trunk/samples/relay-python/Makefile.am
    tuscany/sca-cpp/trunk/samples/relay-python/relay.composite

Modified: tuscany/sca-cpp/trunk/samples/relay-python/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/relay-python/Makefile.am?rev=1053003&r1=1053002&r2=1053003&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/relay-python/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/relay-python/Makefile.am Mon Dec 27 05:59:24 2010
@@ -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

Modified: tuscany/sca-cpp/trunk/samples/relay-python/relay.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/relay-python/relay.composite?rev=1053003&r1=1053002&r2=1053003&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/relay-python/relay.composite (original)
+++ tuscany/sca-cpp/trunk/samples/relay-python/relay.composite Mon Dec 27 05:59:24 2010
@@ -23,7 +23,7 @@
   name="relay">
         
     <component name="JSONTwit">
-        <t:implementation.python script="json.py"/>
+        <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="jsontwit"/>
         </service>        
@@ -33,7 +33,7 @@
     </component>
     
     <component name="XMLTwit">
-        <t:implementation.python script="xml.py"/>
+        <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="xmltwit"/>
         </service>        
@@ -43,7 +43,7 @@
     </component>
     
     <component name="RSSTwit">
-        <t:implementation.python script="rss.py"/>
+        <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="rsstwit"/>
         </service>        
@@ -53,17 +53,17 @@
     </component>
     
     <component name="HTML">
-        <t:implementation.python script="html.py"/>
+        <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="html"/>
         </service>        
         <reference name="target">
-            <t:binding.http uri="http://localhost:8090/test"/>
+            <t:binding.http uri="http://people.apache.org/~jsdelfino/"/>
         </reference>
     </component>
     
     <component name="JSONFB">
-        <t:implementation.python script="json.py"/>
+        <t:implementation.python script="relay.py"/>
         <service name="Relay">
             <t:binding.http uri="jsonfb"/>
         </service>        

Copied: tuscany/sca-cpp/trunk/samples/relay-python/relay.py (from r1053002, tuscany/sca-cpp/trunk/samples/relay-python/xml.py)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/relay-python/relay.py?p2=tuscany/sca-cpp/trunk/samples/relay-python/relay.py&p1=tuscany/sca-cpp/trunk/samples/relay-python/xml.py&r1=1053002&r2=1053003&rev=1053003&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/relay-python/xml.py (original)
+++ tuscany/sca-cpp/trunk/samples/relay-python/relay.py Mon Dec 27 05:59:24 2010
@@ -16,9 +16,6 @@
 #  under the License.
 
 # Relay implementation
-import uuid
-import sys
-
 def get(id, target):
     return target.get(id)