Refactor the sample composites and components and cleanup the component names a bit.

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

1 files changed, 26 insertions, 8 deletions

diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
index 925766a32f..6b9214f6e4 100644
--- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
+++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite
@@ -1,4 +1,22 @@
 <?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" name="palette" targetNamespace="http://palette">
  <service name="contains" promote="contains"/>
  <service name="format" promote="format"/>
@@ -8,49 +26,49 @@
  <service name="replace" promote="replace"/>
  <service name="split" promote="split"/>
  <service name="uppercase" promote="uppercase"/>
- <component x="90" y="10" name="contains" title="contains" color="magenta1">
+ <component x="80" y="10" name="contains" title="contains" color="cyan1">
   <implementation.python script="nuvem/contains.py"/>
   <service name="contains"/>
   <reference name="search"/>
   <reference name="string"/>
  </component>
- <component x="90" y="90" name="format" title="format" color="magenta1">
+ <component x="80" y="90" name="format" title="format" color="cyan1">
   <implementation.python script="nuvem/format_.py"/>
   <service name="format"/>
   <reference name="pattern"/>
   <reference name="values"/>
  </component>
- <component x="160" y="160" name="join" title="join" color="magenta1">
+ <component x="280" y="10" name="join" title="join" color="cyan1">
   <implementation.python script="nuvem/join.py"/>
   <service name="join"/>
   <reference name="separator"/>
   <reference name="list"/>
  </component>
- <component x="90" y="230" name="lowercase" title="lower" color="magenta1">
+ <component x="210" y="90" name="lowercase" title="lower" color="cyan1">
   <implementation.python script="nuvem/lowercase.py"/>
   <service name="lowercase"/>
   <reference name="string"/>
  </component>
- <component x="170" y="90" name="parse" title="parse" color="magenta1">
+ <component x="150" y="90" name="parse" title="parse" color="cyan1">
   <implementation.python script="nuvem/parse.py"/>
   <service name="parse"/>
   <reference name="regexp"/>
   <reference name="string"/>
  </component>
- <component x="180" y="10" name="replace" title="replace" color="magenta1">
+ <component x="150" y="10" name="replace" title="replace" color="cyan1">
   <implementation.python script="nuvem/replace.py"/>
   <service name="replace"/>
   <reference name="from"/>
   <reference name="to"/>
   <reference name="string"/>
  </component>
- <component x="90" y="160" name="split" title="split" color="magenta1">
+ <component x="220" y="10" name="split" title="split" color="cyan1">
   <implementation.python script="nuvem/split.py"/>
   <service name="split"/>
   <reference name="separator"/>
   <reference name="string"/>
  </component>
- <component x="160" y="230" name="uppercase" title="upper" color="magenta1">
+ <component x="270" y="90" name="uppercase" title="upper" color="cyan1">
   <implementation.python script="nuvem/uppercase.py"/>
   <service name="uppercase"/>
   <reference name="string"/>