Add a reusable component that returns the contents of a configured url.

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

8 files changed, 109 insertions, 18 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/testget/app.composite b/sca-cpp/trunk/modules/edit/apps/testget/app.composite
new file mode 100644
index 0000000000..9f841afed6
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testget/app.composite
@@ -0,0 +1,65 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://testget" name="testget">
+ <service name="get" promote="get"/>
+ <component t:x="25" t:y="25" name="get" t:title="http get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text" name="url"/>
+ </component>
+ <component t:x="89" t:y="25" name="text" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.google.com</property>
+ </component>
+ <service name="get2" promote="get2"/>
+ <component t:x="24" t:y="91" name="get2" t:title="http get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text2" name="url"/>
+ </component>
+ <service name="get3" promote="get3"/>
+ <component t:x="23" t:y="175" name="get3" t:title="http get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text3" name="url"/>
+ </component>
+ <component t:x="87" t:y="175" name="text3" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://www.weather.gov/forecasts/xml/sample_products/browser_interface/ndfdXMLclient.php?whichClient=NDFDgen&amp;lat=38.99&amp;lon=-77.01&amp;listLatLon=&amp;lat1=&amp;lon1=&amp;lat2=&amp;lon2=&amp;resolutionSub=&amp;listLat1=&amp;listLon1=&amp;listLat2=&amp;listLon2=&amp;resolutionList=&amp;endPoint1Lat=&amp;endPoint1Lon=&amp;endPoint2Lat=&amp;endPoint2Lon=&amp;listEndPoint1Lat=&amp;listEndPoint1Lon=&amp;listEndPoint2Lat=&amp;listEndPoint2Lon=&amp;zipCodeList=&amp;listZipCodeList=&amp;centerPointLat=&amp;centerPointLon=&amp;distanceLat=&amp;distanceLon=&amp;resolutionSquare=&amp;listCenterPointLat=&amp;listCenterPointLon=&amp;listDistanceLat=&amp;listDistanceLon=&amp;listResolutionSquare=&amp;citiesLevel=&amp;listCitiesLevel=&amp;sector=&amp;gmlListLatLon=&amp;featureType=&amp;requestedTime=&amp;startTime=&amp;endTime=&amp;compType=&amp;propertyName=&amp;product=time-series&amp;begin=2004-01-01T00%3A00%3A00&amp;end=2015-03-10T00%3A00%3A00&amp;maxt=maxt&amp;Submit=Submit</property>
+ </component>
+ <component t:x="88" t:y="91" name="text2" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://maps.googleapis.com/maps/api/directions/json?origin=Boston,MA&amp;destination=Concord,MA&amp;waypoints=Charlestown,MA|Lexington,MA&amp;sensor=false</property>
+ </component>
+ <service name="get4" promote="get4"/>
+ <component t:x="26" t:y="267" name="get4" t:title="http get" t:color="green1">
+  <implementation.cpp path="lib/http" library="libhttpget"/>
+  <service name="get"/>
+  <reference target="text4" name="url"/>
+ </component>
+ <component t:x="90" t:y="267" name="text4" t:title="text" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>http://feedproxy.google.com/TechCrunch</property>
+ </component>
+</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testget/app.html b/sca-cpp/trunk/modules/edit/apps/testget/app.html
new file mode 100644
index 0000000000..5c7c7219bb
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testget/app.html
@@ -0,0 +1,20 @@
+<?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.    
+-->
+<DIV id="page"/>
diff --git a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
index 242a49c013..415de6a677 100644
--- a/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testlogic/app.composite
@@ -26,15 +26,10 @@
   <reference target="text" name="then"/>
   <reference target="text2" name="else"/>
  </component>
- <component t:x="123" t:y="21" name="item" t:title="item" t:color="yellow1">
-  <t:implementation.python script="nuvem/item.py"/>
-  <service name="item"/>
-  <property>item</property>
- </component>
  <component t:x="75" t:y="24" name="greater" t:title="gt" t:color="magenta1">
   <t:implementation.python script="nuvem/greater.py"/>
   <service name="greater"/>
-  <reference target="item" name="value1"/>
+  <reference target="number2" name="value1"/>
   <reference target="number" name="value2"/>
  </component>
  <component t:x="118" t:y="66" name="number" t:title="number" t:color="orange1">
@@ -52,4 +47,9 @@
   <service name="text"/>
   <property>not greater than 5</property>
  </component>
+ <component t:x="88" t:y="25" name="number2" t:title="number" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>3</property>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/dashboards/joe@localhost b/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
index 5771c2f9de..9c40c7bd58 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
+++ b/sca-cpp/trunk/modules/edit/dashboards/joe@localhost
@@ -1 +1 @@
-((entry (title "An Empty Test App") (id "test")) (entry (title "Test Values and Lists") (id "testvalues")) (entry (title "Test Social Components") (id "testsocial")) (entry (title "Test URL Components") (id "testurl")) (entry (title "Test Logic Components") (id "testlogic")) (entry (title "Test Text Processing Components") (id "testtext")) (entry (title "An App that shows my Social Profiles") (id "me360")) (entry (title "An App that shows Friends Near Me") (id "nearme")))
+((entry (title "An Empty Test App") (id "test")) (entry (title "Test Values and Lists") (id "testvalues")) (entry (title "Test Social Components") (id "testsocial")) (entry (title "Test URL Components") (id "testurl")) (entry (title "Test Logic Components") (id "testlogic")) (entry (title "Test Text Processing Components") (id "testtext")) (entry (title "Test HTTP Get Component") (id "testget")) (entry (title "An App that shows my Social Profiles") (id "me360")) (entry (title "An App that shows Friends Near Me") (id "nearme")))
diff --git a/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com b/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com
index 5771c2f9de..9c40c7bd58 100644
--- a/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com
+++ b/sca-cpp/trunk/modules/edit/dashboards/joe@sca-store.com
@@ -1 +1 @@
-((entry (title "An Empty Test App") (id "test")) (entry (title "Test Values and Lists") (id "testvalues")) (entry (title "Test Social Components") (id "testsocial")) (entry (title "Test URL Components") (id "testurl")) (entry (title "Test Logic Components") (id "testlogic")) (entry (title "Test Text Processing Components") (id "testtext")) (entry (title "An App that shows my Social Profiles") (id "me360")) (entry (title "An App that shows Friends Near Me") (id "nearme")))
+((entry (title "An Empty Test App") (id "test")) (entry (title "Test Values and Lists") (id "testvalues")) (entry (title "Test Social Components") (id "testsocial")) (entry (title "Test URL Components") (id "testurl")) (entry (title "Test Logic Components") (id "testlogic")) (entry (title "Test Text Processing Components") (id "testtext")) (entry (title "Test HTTP Get Component") (id "testget")) (entry (title "An App that shows my Social Profiles") (id "me360")) (entry (title "An App that shows Friends Near Me") (id "nearme")))
diff --git a/sca-cpp/trunk/modules/edit/htdocs/main.html b/sca-cpp/trunk/modules/edit/htdocs/main.html
index b219c27e50..ddd89b6bab 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/main.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/main.html
@@ -34,13 +34,13 @@
 <p>Try the <a href="dash" target="_parent">App Dashboard</a> to manage your collection of apps.</p>
 
 <h2>Composition Editor</h2>
-<p>Try the <a href="graph/?app=myprofile" target="_parent">Composition Editor</a> to compose the logic of an app.</p>
+<p>Try the <a href="graph/?app=testvalues" target="_parent">Composition Editor</a> to compose the logic of an app.</p>
 
 <h2>Page Editor</h2>
-<p>Try the <a href="page/?app=myprofile" target="_parent">Page Editor</a> to draw an app page.</p>
+<p>Try the <a href="page/?app=testvalues" target="_parent">Page Editor</a> to draw an app page.</p>
 
 <h2>App Settings Editor</h2>
-<p>Try the <a href="app/?app=myprofile" target="_parent">App Settings Editor</a> to edit the settings of app.</p>
+<p>Try the <a href="app/?app=testvalues" target="_parent">App Settings Editor</a> to edit the settings of app.</p>
 
 </div>
 
diff --git a/sca-cpp/trunk/modules/edit/mkapplinks b/sca-cpp/trunk/modules/edit/mkapplinks
index 66becf1618..3a9cd67e60 100755
--- a/sca-cpp/trunk/modules/edit/mkapplinks
+++ b/sca-cpp/trunk/modules/edit/mkapplinks
@@ -24,6 +24,12 @@ for n in `ls apps | awk '{ printf "apps/%s/nuvem\n", $1 }'`; do
     fi
 done
 
+for n in `ls apps | awk '{ printf "apps/%s/lib\n", $1 }'`; do
+    if [ ! -e "$n" ]; then
+        ln -s ../../../../components "$n"
+    fi
+done
+
 for n in `ls apps | awk '{ printf "apps/%s/htdocs\n", $1 }'`; do
     if [ ! -e "$n" ]; then
         mkdir "$n"
diff --git a/sca-cpp/trunk/modules/edit/palettes/url/palette.composite b/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
index 3a85322e51..dc3b40e6a7 100644
--- a/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/url/palette.composite
@@ -26,8 +26,8 @@
     <service name="path" promote="path"/>
     <service name="params" promote="params"/>
     <service name="user" promote="user"/>
-    <service name="realm" promote="realm"/>
     <service name="email" promote="email"/>
+    <service name="get" promote="get"/>
 
     <component name="host" t:title="host" t:color="green1">
         <t:implementation.python script="nuvem/host.py"/>
@@ -53,16 +53,16 @@
         <property name="user"></property>
     </component>
     
-    <component name="realm" t:title="realm" t:color="green1">
-        <t:implementation.python script="nuvem/realm.py"/>
-        <service name="realm"/>
-        <property name="realm"></property>
-    </component>
-    
     <component name="email" t:title="email" t:color="green1">
         <t:implementation.python script="nuvem/email.py"/>
         <service name="email"/>
         <property name="email"></property>
     </component>
     
+    <component name="get" t:title="http get" t:color="green1">
+        <implementation.cpp path="lib/http" library="libhttpget"/>
+        <service name="get"/>
+        <reference name="url"/>
+    </component>
+    
 </composite>