From 636e046fd1cdf7a6f1a365e4f02f5bbc2f593c70 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 2 May 2011 05:58:47 +0000
Subject: Reformat, sort and refactor test and sample apps.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1098490 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/modules/edit/apps/testurl/app.composite  | 120 ++++++++++-----------
 sca-cpp/trunk/modules/edit/apps/testurl/app.html   |  24 -----
 .../modules/edit/apps/testurl/htdocs/app.html      |  24 +++++
 3 files changed, 84 insertions(+), 84 deletions(-)
 delete mode 100644 sca-cpp/trunk/modules/edit/apps/testurl/app.html
 create mode 100644 sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html

(limited to 'sca-cpp/trunk/modules/edit/apps/testurl')

diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
index 6cda648ac1..2bb49a9e81 100644
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/app.composite
@@ -17,56 +17,25 @@
  * 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://testurl" name="testurl">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" name="app" targetNamespace="http://app">
+ <service name="email" promote="email"/>
  <service name="host" promote="host"/>
- <component t:x="40" t:y="30" name="host" t:title="host" t:color="green1">
-  <t:implementation.python script="nuvem/host.py"/>
-  <service name="host"/>
-  <property name="host"/>
- </component>
- <service name="path" promote="path"/>
- <component t:x="39" t:y="81" name="path" t:title="path" t:color="green1">
-  <t:implementation.python script="nuvem/path.py"/>
-  <service name="path"/>
-  <property name="path"/>
- </component>
  <service name="params" promote="params"/>
- <component t:x="41" t:y="133" name="params" t:title="?params" t:color="green1">
-  <t:implementation.python script="nuvem/params.py"/>
-  <service name="params"/>
-  <property name="params"/>
- </component>
- <service name="user" promote="user"/>
- <component t:x="37" t:y="198" name="user" t:title="user" t:color="green1">
-  <t:implementation.python script="nuvem/user.py"/>
-  <service name="user"/>
-  <property name="user"/>
- </component>
+ <service name="path" promote="path"/>
  <service name="realm" promote="realm"/>
- <component t:x="35" t:y="254" name="realm" t:title="realm" t:color="green1">
-  <t:implementation.python script="nuvem/realm.py"/>
-  <service name="realm"/>
-  <property name="realm"/>
- </component>
- <service name="email" promote="email"/>
- <component t:x="35" t:y="316" name="email" t:title="email" t:color="green1">
+ <service name="url" promote="url"/>
+ <service name="user" promote="user"/>
+ <component t:x="17" t:y="223" name="email" t:title="email" t:color="green1">
   <t:implementation.python script="nuvem/email.py"/>
   <service name="email"/>
   <property name="email"/>
  </component>
- <service name="url" promote="url"/>
- <component t:x="162" t:y="36" name="url" t:title="url" t:color="green1">
-  <t:implementation.python script="nuvem/url.py"/>
-  <service name="url"/>
-  <reference target="text" name="address"/>
-  <reference target="list" name="args"/>
- </component>
- <component t:x="240" t:y="27" name="text" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>http://sca-store.com/</property>
+ <component t:x="14" t:y="1" name="host" t:title="host" t:color="green1">
+  <t:implementation.python script="nuvem/host.py"/>
+  <service name="host"/>
+  <property name="host"/>
  </component>
- <component t:x="242" t:y="58" name="list" t:title="list" t:color="yellow1">
+ <component name="list" t:title="list" t:color="yellow1">
   <t:implementation.python script="nuvem/list_.py"/>
   <service name="list"/>
   <reference target="text2" name="item" t:clonable="true"/>
@@ -76,47 +45,78 @@
   <reference target="property3" name="item" t:clonable="true"/>
   <reference name="item" t:clonable="true"/>
  </component>
- <component t:x="280" t:y="61" name="text2" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>test</property>
+ <component name="number" t:title="#" t:color="orange1">
+  <t:implementation.python script="nuvem/number.py"/>
+  <service name="number"/>
+  <property>123</property>
  </component>
- <component t:x="282" t:y="90" name="text3" t:title=" '{propval}'" t:color="orange1">
-  <t:implementation.python script="nuvem/text.py"/>
-  <service name="text"/>
-  <property>path</property>
+ <component t:x="16" t:y="91" name="params" t:title="?params" t:color="green1">
+  <t:implementation.python script="nuvem/params.py"/>
+  <service name="params"/>
+  <property name="params"/>
  </component>
- <component t:x="277" t:y="108" name="property" t:title="{propval} :" t:color="orange1">
+ <component t:x="17" t:y="48" name="path" t:title="path" t:color="green1">
+  <t:implementation.python script="nuvem/path.py"/>
+  <service name="path"/>
+  <property name="path"/>
+ </component>
+ <component name="property" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text4" name="value"/>
   <property>parmx</property>
  </component>
- <component t:x="276" t:y="169" name="property2" t:title="{propval} :" t:color="orange1">
+ <component name="property2" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="text5" name="value"/>
   <property>parmy</property>
  </component>
- <component t:x="271" t:y="224" name="property3" t:title="{propval} :" t:color="orange1">
+ <component name="property3" t:title="{propval} :" t:color="orange1">
   <t:implementation.python script="nuvem/assoc.py"/>
   <service name="property"/>
   <reference target="number" name="value"/>
   <property>parmn</property>
  </component>
- <component t:x="385" t:y="228" name="number" t:title="#" t:color="orange1">
-  <t:implementation.python script="nuvem/number.py"/>
-  <service name="number"/>
-  <property>123</property>
+ <component t:x="14" t:y="177" name="realm" t:title="realm" t:color="green1">
+  <t:implementation.python script="nuvem/realm.py"/>
+  <service name="realm"/>
+  <property name="realm"/>
  </component>
- <component t:x="386" t:y="169" name="text5" t:title=" '{propval}'" t:color="orange1">
+ <component name="text" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
-  <property>yy</property>
+  <property>http://sca-store.com/</property>
  </component>
- <component t:x="386" t:y="110" name="text4" t:title=" '{propval}'" t:color="orange1">
+ <component name="text2" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>test</property>
+ </component>
+ <component name="text3" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>path</property>
+ </component>
+ <component name="text4" t:title=" '{propval}'" t:color="orange1">
   <t:implementation.python script="nuvem/text.py"/>
   <service name="text"/>
   <property>xx</property>
  </component>
+ <component name="text5" t:title=" '{propval}'" t:color="orange1">
+  <t:implementation.python script="nuvem/text.py"/>
+  <service name="text"/>
+  <property>yy</property>
+ </component>
+ <component t:x="117" t:y="14" name="url" t:title="url" t:color="green1">
+  <t:implementation.python script="nuvem/url.py"/>
+  <service name="url"/>
+  <reference target="text" name="address"/>
+  <reference target="list" name="args"/>
+ </component>
+ <component t:x="16" t:y="134" name="user" t:title="user" t:color="green1">
+  <t:implementation.python script="nuvem/user.py"/>
+  <service name="user"/>
+  <property name="user"/>
+ </component>
 </composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/app.html
deleted file mode 100644
index 9641f58ba5..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/testurl/app.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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">
- <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
-  <H2>Test url components</H2>
- </SPAN>
-</DIV>
diff --git a/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
new file mode 100644
index 0000000000..9641f58ba5
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/apps/testurl/htdocs/app.html
@@ -0,0 +1,24 @@
+<?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">
+ <SPAN id="h2" class="h2" style="position: absolute; top: 0px; left: 2px; ">
+  <H2>Test url components</H2>
+ </SPAN>
+</DIV>
-- 
cgit v1.2.3