Cleanup and organize sample components, apps and html pages.

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

1 files changed, 32 insertions, 59 deletions

diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
index 050316acb1..af293b97f5 100644
--- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite
@@ -1,61 +1,34 @@
 <?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 requiblue 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://talk"
-  name="palette">
-        
-    <service name="voicecall" promote="voicecall"/>
-    <service name="sendsms" promote="sendsms"/>
-    <service name="sendgtalk" promote="sendgtalk"/>
-    <service name="sendemail" promote="sendemail"/>
-
-    <component name="voicecall" t:title="voice **" t:color="blue1">
-        <t:implementation.python script="nuvem/voicecall.py"/>
-        <service name="voicecall"/>
-        <reference name="to"/>
-    </component>
-    
-    <component name="sendsms" t:title="sms **" t:color="blue1">
-        <t:implementation.python script="nuvem/sendsms.py"/>
-        <service name="sendsms"/>
-        <reference name="user"/>
-        <reference name="to"/>
-        <reference name="msg"/>
-    </component>
-    
-    <component name="sendgtalk" t:title="gtalk" t:color="blue1">
-        <implementation.cpp path="lib/chat" library="libchat-sender2"/>
-        <service name="sendgtalk"/>
-        <reference name="jid"/>
-        <reference name="pass"/>
-        <reference name="to"/>
-        <reference name="msg"/>
-    </component>
-    
-    <component name="sendemail" t:title="email **" t:color="blue1">
-        <t:implementation.python script="nuvem/sendemail.py"/>
-        <service name="sendemail"/>
-        <reference name="from"/>
-        <reference name="to"/>
-        <reference name="msg"/>
-    </component>
-    
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="palette" targetNamespace="http://palette">
+ <service name="sendemail" promote="sendemail"/>
+ <service name="sendgtalk" promote="sendgtalk"/>
+ <service name="sendsms" promote="sendsms"/>
+ <service name="voicecall" promote="voicecall"/>
+ <component x="170" y="10" name="sendemail" title="email **" color="blue1">
+  <implementation.python script="nuvem/sendemail.py"/>
+  <service name="sendemail"/>
+  <reference name="from"/>
+  <reference name="to"/>
+  <reference name="msg"/>
+ </component>
+ <component x="90" y="10" name="sendgtalk" title="gtalk" color="blue1">
+  <implementation.cpp path="lib/chat" library="libchat-sender2"/>
+  <service name="sendgtalk"/>
+  <reference name="jid"/>
+  <reference name="pass"/>
+  <reference name="to"/>
+  <reference name="msg"/>
+ </component>
+ <component x="90" y="120" name="sendsms" title="sms **" color="blue1">
+  <implementation.python script="nuvem/sendsms.py"/>
+  <service name="sendsms"/>
+  <reference name="user"/>
+  <reference name="to"/>
+  <reference name="msg"/>
+ </component>
+ <component x="170" y="120" name="voicecall" title="voice **" color="blue1">
+  <implementation.python script="nuvem/voicecall.py"/>
+  <service name="voicecall"/>
+  <reference name="to"/>
+ </component>
 </composite>