Refactoring sandbox structure to accomodate 1.x versus 2.x stuff

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

65 files changed, 0 insertions, 970 deletions

diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/java/customer/CustomerService.java b/sandbox/lresende/sca/demos/customer-map/src/main/java/customer/CustomerService.java
deleted file mode 100644
index 5a99f0bc77..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/java/customer/CustomerService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.    
- */
-
-package customer;
-
-import org.osoa.sca.annotations.Remotable;
-
-import commonj.sdo.DataObject;
-
-/**
- * 
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface CustomerService {
-    
-    public DataObject getCustomers();
-
-}
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/java/launch/Launch.java b/sandbox/lresende/sca/demos/customer-map/src/main/java/launch/Launch.java
deleted file mode 100644
index 2bbb40c6a5..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/java/launch/Launch.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.    
- */
-
-package launch;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class Launch {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("customer-map.composite");
-        System.out.println("customer-map.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer-map.composite b/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer-map.composite
deleted file mode 100644
index f7c979687d..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer-map.composite
+++ /dev/null
@@ -1,42 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://demo/customer-map"
-	name="customer">
-
-	<component name="customer-map">
-		<tuscany:implementation.resource location="html"/>
-		<service name="Resource">
-			<tuscany:binding.http uri="http://localhost:8080/customer-map"/>
-		</service> 	
-	</component>
-	
-    <component name="CustomerServiceComponent">
-    	<tuscany:implementation.das config="customer.xml" dataAccessType="rdb">
-    		<tuscany:connectionInfo>
-    			<tuscany:connectionProperties
-    				driverClass="org.apache.derby.jdbc.EmbeddedDriver"
-    				databaseURL="jdbc:derby:target/classes/dastest; create = true"
-    				loginTimeout="600000" />
-    		</tuscany:connectionInfo>
-    	</tuscany:implementation.das>
-    </component>
-</composite>
\ No newline at end of file
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.componentType b/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.componentType
deleted file mode 100644
index bf56a3f4e9..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.componentType
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-    <service name="CustomerService">
-        <interface.java interface="customer.CustomerService"/>
-        <tuscany:binding.jsonrpc/>
-    </service>
-
-</componentType>         
\ No newline at end of file
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xml b/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xml
deleted file mode 100644
index 17d5da9cd6..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xml
+++ /dev/null
@@ -1,27 +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.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd"> 
-    
-    <Command name="getCustomers" SQL="select * from CUSTOMER" kind="Select"/>
-    
-    <Table tableName="CUSTOMER" typeName="Customer">
-        <Column columnName="ID" primaryKey="true" generated="true"/>
-    </Table>
-</Config>
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xsd b/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xsd
deleted file mode 100644
index f00d0ec56a..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/customer.xsd
+++ /dev/null
@@ -1,35 +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.
- -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-            xmlns:this="http:///org.apache.tuscany.das.rdb.test/customer.xsd" 
-            targetNamespace="http:///org.apache.tuscany.das.rdb.test/customer.xsd">
-	
-	  <xsd:complexType name="Customer">
-       <xsd:sequence>
-          <xsd:element name="ID" nillable="false" type="xsd:int"/>
-          <xsd:element name="name" type="xsd:string"/>
-          <xsd:element name="address" type="xsd:string"/>  
-          <xsd:element name="city" type="xsd:string"/>
-          <xsd:element name="state" type="xsd:string"/>
-          <xsd:element name="latitude" type="xsd:string"/>
-          <xsd:element name="longitude" type="xsd:string"/>
-       </xsd:sequence>
-  	 </xsd:complexType>   
-</xsd:schema>
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/db.lck b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/db.lck
deleted file mode 100644
index 6b9b2452e0..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/db.lck
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log.ctrl b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log.ctrl
deleted file mode 100644
index 4238225f1f..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log.ctrl
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log1.dat
deleted file mode 100644
index e9eb981c16..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/log1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/logmirror.ctrl b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/logmirror.ctrl
deleted file mode 100644
index 4238225f1f..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/log/logmirror.ctrl
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c10.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c10.dat
deleted file mode 100644
index 27e2ac866e..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c10.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c101.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c101.dat
deleted file mode 100644
index fc4340b2e7..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c101.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c111.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c111.dat
deleted file mode 100644
index 750dffff3f..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c111.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c121.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c121.dat
deleted file mode 100644
index 0d0b53b30e..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c121.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c130.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c130.dat
deleted file mode 100644
index 65f1689e47..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c130.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c141.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c141.dat
deleted file mode 100644
index 5b509fb668..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c141.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c150.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c150.dat
deleted file mode 100644
index d985c31be4..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c150.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c161.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c161.dat
deleted file mode 100644
index d3af4852f2..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c161.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c171.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c171.dat
deleted file mode 100644
index 731d9e87fb..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c171.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c180.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c180.dat
deleted file mode 100644
index 82298723d7..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c180.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c191.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c191.dat
deleted file mode 100644
index b2d149a0f3..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c191.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1a1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1a1.dat
deleted file mode 100644
index 5001ad3d63..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1a1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1b1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1b1.dat
deleted file mode 100644
index b3a539d635..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1b1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1c0.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1c0.dat
deleted file mode 100644
index 359525a31a..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1c0.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1d1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1d1.dat
deleted file mode 100644
index 9f257df932..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1d1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1e0.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1e0.dat
deleted file mode 100644
index e43e52fb7f..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1e0.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1f1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1f1.dat
deleted file mode 100644
index 7e6ee3b1e0..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c1f1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c20.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c20.dat
deleted file mode 100644
index 2b9a6b96d4..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c20.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c200.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c200.dat
deleted file mode 100644
index cae919d022..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c200.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c211.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c211.dat
deleted file mode 100644
index c7e311b00e..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c211.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c221.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c221.dat
deleted file mode 100644
index 28e89367ce..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c221.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c230.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c230.dat
deleted file mode 100644
index c8aca2ee6f..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c230.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c241.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c241.dat
deleted file mode 100644
index 3478bc897d..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c241.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c251.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c251.dat
deleted file mode 100644
index d3d6adf4fb..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c251.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c260.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c260.dat
deleted file mode 100644
index 8d7333df7d..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c260.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c271.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c271.dat
deleted file mode 100644
index af722f7d73..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c271.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c281.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c281.dat
deleted file mode 100644
index 3972983c2e..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c281.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c290.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c290.dat
deleted file mode 100644
index 31577b8124..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c290.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2a1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2a1.dat
deleted file mode 100644
index 0f700d13a7..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2a1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2b1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2b1.dat
deleted file mode 100644
index 1d6382fb3d..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2b1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2c1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2c1.dat
deleted file mode 100644
index 3bc60d886b..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2c1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2d0.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2d0.dat
deleted file mode 100644
index c542d3c91c..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2d0.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2e1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2e1.dat
deleted file mode 100644
index 16abd20b5f..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2e1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2f0.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2f0.dat
deleted file mode 100644
index eb26be5932..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c2f0.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c300.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c300.dat
deleted file mode 100644
index 35a164db8a..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c300.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c31.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c31.dat
deleted file mode 100644
index 44f7fa784d..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c31.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c311.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c311.dat
deleted file mode 100644
index 85c095cadb..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c311.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c41.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c41.dat
deleted file mode 100644
index 519f1a49be..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c41.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c51.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c51.dat
deleted file mode 100644
index 452a28db9b..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c51.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c60.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c60.dat
deleted file mode 100644
index 94c357868f..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c60.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c71.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c71.dat
deleted file mode 100644
index 9ca2ca97d1..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c71.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c81.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c81.dat
deleted file mode 100644
index 85bc9c8351..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c81.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c90.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c90.dat
deleted file mode 100644
index 14e77ef636..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/c90.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ca1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ca1.dat
deleted file mode 100644
index 624ae61a85..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ca1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cb1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cb1.dat
deleted file mode 100644
index 97e6f19260..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cb1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cc0.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cc0.dat
deleted file mode 100644
index 5126021a83..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cc0.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cd1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cd1.dat
deleted file mode 100644
index 2e135b64ab..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cd1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ce1.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ce1.dat
deleted file mode 100644
index 076423c10a..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/ce1.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cf0.dat b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cf0.dat
deleted file mode 100644
index bfae1c8b85..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/seg0/cf0.dat
+++ /dev/null
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/service.properties b/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/service.properties
deleted file mode 100644
index 997a33e4db..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/dastest/service.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#D:\dev\Opensource\Apache\Tuscany\source\java\sca\demos\google-maps\src\main\resources\dastest
-# ********************************************************************
-# ***                Please do NOT edit this file.                 ***
-# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
-# ********************************************************************
-#Wed Aug 29 13:46:31 PDT 2007
-SysschemasIndex2Identifier=225
-SyscolumnsIdentifier=144
-SysconglomeratesIndex1Identifier=49
-SysconglomeratesIdentifier=32
-SyscolumnsIndex2Identifier=177
-SysschemasIndex1Identifier=209
-SysconglomeratesIndex3Identifier=81
-SystablesIndex2Identifier=129
-SyscolumnsIndex1Identifier=161
-derby.serviceProtocol=org.apache.derby.database.Database
-SysschemasIdentifier=192
-derby.storage.propertiesId=16
-SysconglomeratesIndex2Identifier=65
-derby.serviceLocale=en_US
-SystablesIdentifier=96
-SystablesIndex1Identifier=113
\ No newline at end of file
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-atom.js b/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-atom.js
deleted file mode 100644
index aacf864f14..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-atom.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.    
- */
-	
-function AtomClient(uri) {
-	
-	this.uri=uri;
-	
-	this.get = function(id, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-					if (responseFunction != null) responseFunction(xhr.responseXML);
-				} else {
-					alert("get - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("GET", uri + id, true);
-		xhr.send(null);
-	}	
-	this.post = function (entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 201) {
-					if (responseFunction != null) responseFunction(xhr.responseXML);
-				} else {
-					alert("post - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("POST", uri, true);
-		xhr.setRequestHeader("Content-Type", "application/atom+xml");
-		xhr.send(entry);
-	}
-	this.put = function (id, entry, responseFunction) {
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-					if (responseFunction != null) responseFunction(xhr.responseXML);
-				} else {
-					alert("put - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("PUT", uri + id, true);
-		xhr.setRequestHeader("Content-Type", "application/atom+xml");
-		xhr.send(entry);
-	}	
-	this.delete = function (id, responseFunction) {       
-		var xhr = this.createXMLHttpRequest();
-		xhr.onreadystatechange = function() {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200) {
-					if (responseFunction != null) responseFunction();
-				} else {
-					alert("delete - Error getting data from the server");
-				}
-			}
-		}
-		xhr.open("DELETE", uri + id, true);		
-		xhr.send(null);
-	}
-	
-	this.createXMLHttpRequest = function () {
-		try {return new XMLHttpRequest();} catch(e) {}      
-		try {return new ActiveXObject("Msxml2.XMLHTTP");} catch(e) {}
-		try {return new ActiveXObject("Microsoft.XMLHTTP");} catch(e) {}
-		alert("XML http request not supported");
-		return null;
-	}
-}
-
-bindingatom = "loaded";
\ No newline at end of file
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-jsonrpc.js b/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-jsonrpc.js
deleted file mode 100644
index 7f4a092f71..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/binding-jsonrpc.js
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- * JSON-RPC JavaScript client
- *
- * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $
- *
- * Copyright (c) 2003-2004 Jan-Klaas Kollhof
- * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
- *
- * This code is based on Jan-Klaas' JavaScript o lait library (jsolait).
- *
- * Licensed 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.
- *
- */
-
-/*
- * Modifications for Apache Tuscany:
- * - JSONRpcClient_createMethod changed so callback is last arg
- */
-
-/* escape a character */
-
-escapeJSONChar =
-function escapeJSONChar(c)
-{
-    if(c == "\"" || c == "\\") return "\\" + c;
-    else if (c == "\b") return "\\b";
-    else if (c == "\f") return "\\f";
-    else if (c == "\n") return "\\n";
-    else if (c == "\r") return "\\r";
-    else if (c == "\t") return "\\t";
-    var hex = c.charCodeAt(0).toString(16);
-    if(hex.length == 1) return "\\u000" + hex;
-    else if(hex.length == 2) return "\\u00" + hex;
-    else if(hex.length == 3) return "\\u0" + hex;
-    else return "\\u" + hex;
-};
-
-
-/* encode a string into JSON format */
-
-escapeJSONString =
-function escapeJSONString(s)
-{
-    /* The following should suffice but Safari's regex is b0rken
-       (doesn't support callback substitutions)
-       return "\"" + s.replace(/([^\u0020-\u007f]|[\\\"])/g,
-       escapeJSONChar) + "\"";
-    */
-
-    /* Rather inefficient way to do it */
-    var parts = s.split("");
-    for(var i=0; i < parts.length; i++) {
-	var c =parts[i];
-	if(c == '"' ||
-	   c == '\\' ||
-	   c.charCodeAt(0) < 32 ||
-	   c.charCodeAt(0) >= 128)
-	    parts[i] = escapeJSONChar(parts[i]);
-    }
-    return "\"" + parts.join("") + "\"";
-};
-
-
-/* Marshall objects to JSON format */
-
-toJSON = function toJSON(o)
-{
-    if(o == null) {
-	return "null";
-    } else if(o.constructor == String) {
-	return escapeJSONString(o);
-    } else if(o.constructor == Number) {
-	return o.toString();
-    } else if(o.constructor == Boolean) {
-	return o.toString();
-    } else if(o.constructor == Date) {
-	return '{javaClass: "java.util.Date", time: ' + o.valueOf() +'}';
-    } else if(o.constructor == Array) {
-	var v = [];
-	for(var i = 0; i < o.length; i++) v.push(toJSON(o[i]));
-	return "[" + v.join(", ") + "]";
-    } else {
-	var v = [];
-	for(attr in o) {
-	    if(o[attr] == null) v.push("\"" + attr + "\": null");
-	    else if(typeof o[attr] == "function"); /* skip */
-	    else v.push(escapeJSONString(attr) + ": " + toJSON(o[attr]));
-	}
-	return "{" + v.join(", ") + "}";
-    }
-};
-
-
-/* JSONRpcClient constructor */
-
-JSONRpcClient =
-function JSONRpcClient_ctor(serverURL, user, pass, objectID)
-{
-    this.serverURL = serverURL;
-    this.user = user;
-    this.pass = pass;
-    this.objectID = objectID;
-
-    /* Add standard methods */
-    if(this.objectID) {
-	this._addMethods(["listMethods"]);
-	var req = this._makeRequest("listMethods", []);
-    } else {
-	this._addMethods(["system.listMethods"]);
-	var req = this._makeRequest("system.listMethods", []);
-    }
-    var m = this._sendRequest(req);
-    this._addMethods(m);
-};
-
-
-/* JSONRpcCLient.Exception */
-
-JSONRpcClient.Exception =
-function JSONRpcClient_Exception_ctor(code, message, javaStack)
-{
-    this.code = code;
-    var name;
-    if(javaStack) {
-	this.javaStack = javaStack;
-	var m = javaStack.match(/^([^:]*)/);
-	if(m) name = m[0];
-    }
-    if(name) this.name = name;
-    else this.name = "JSONRpcClientException";
-    this.message = message;
-};
-
-JSONRpcClient.Exception.CODE_REMOTE_EXCEPTION = 490;
-JSONRpcClient.Exception.CODE_ERR_CLIENT = 550;
-JSONRpcClient.Exception.CODE_ERR_PARSE = 590;
-JSONRpcClient.Exception.CODE_ERR_NOMETHOD = 591;
-JSONRpcClient.Exception.CODE_ERR_UNMARSHALL = 592;
-JSONRpcClient.Exception.CODE_ERR_MARSHALL = 593;
-
-JSONRpcClient.Exception.prototype = new Error();
-
-JSONRpcClient.Exception.prototype.toString =
-function JSONRpcClient_Exception_toString(code, msg)
-{
-    return this.name + ": " + this.message;
-};
-
-
-/* Default top level exception handler */
-
-JSONRpcClient.default_ex_handler =
-function JSONRpcClient_default_ex_handler(e) { alert(e); };
-
-
-/* Client settable variables */
-
-JSONRpcClient.toplevel_ex_handler = JSONRpcClient.default_ex_handler;
-JSONRpcClient.profile_async = false;
-JSONRpcClient.max_req_active = 1;
-JSONRpcClient.requestId = 1;
-
-
-/* JSONRpcClient implementation */
-
-JSONRpcClient.prototype._createMethod =
-function JSONRpcClient_createMethod(methodName)
-{
-    var fn=function()
-    {
-	var args = [];
-	var callback = null;
-	for(var i=0;i<arguments.length;i++) args.push(arguments[i]);
-
-/*	TUSCANY change callback to be last arg instead of first to match binding.ajax
-	if(typeof args[0] == "function") callback = args.shift();
-*/
-	if(typeof args[arguments.length-1] == "function") callback = args.pop();
-
-	var req = fn.client._makeRequest.call(fn.client, fn.methodName,
-					      args, callback);
-	if(callback == null) {
-	    return fn.client._sendRequest.call(fn.client, req);
-	} else {
-	    JSONRpcClient.async_requests.push(req);
-	    JSONRpcClient.kick_async();
-	    return req.requestId;
-	}
-    };
-    fn.client = this;
-    fn.methodName = methodName;
-    return fn;
-};
-
-JSONRpcClient.prototype._addMethods =
-function JSONRpcClient_addMethods(methodNames)
-{
-    for(var i=0; i<methodNames.length; i++) {
-	var obj = this;
-	var names = methodNames[i].split(".");
-	for(var n=0; n<names.length-1; n++) {
-	    var name = names[n];
-	    if(obj[name]) {
-		obj = obj[name];
-	    } else {
-		obj[name]  = new Object();
-		obj = obj[name];
-	    }
-	}
-	var name = names[names.length-1];
-	if(!obj[name]) {
-	    var method = this._createMethod(methodNames[i]);
-	    obj[name] = method;
-	}
-    }
-};
-
-JSONRpcClient._getCharsetFromHeaders =
-function JSONRpcClient_getCharsetFromHeaders(http)
-{
-    try {
-	var contentType = http.getResponseHeader("Content-type");
-	var parts = contentType.split(/\s*;\s*/);
-	for(var i =0; i < parts.length; i++) {
-	    if(parts[i].substring(0, 8) == "charset=")
-		return parts[i].substring(8, parts[i].length);
-	}
-    } catch (e) {}
-    return "UTF-8"; /* default */
-};
-
-/* Async queue globals */
-JSONRpcClient.async_requests = [];
-JSONRpcClient.async_inflight = {};
-JSONRpcClient.async_responses = [];
-JSONRpcClient.async_timeout = null;
-JSONRpcClient.num_req_active = 0;
-
-JSONRpcClient._async_handler =
-function JSONRpcClient_async_handler()
-{
-    JSONRpcClient.async_timeout = null;
-
-    while(JSONRpcClient.async_responses.length > 0) {
-	var res = JSONRpcClient.async_responses.shift();
-	if(res.canceled) continue;
-	if(res.profile) res.profile.dispatch = new Date();
-	try {
-	    res.cb(res.result, res.ex, res.profile);
-	} catch(e) {
-	    JSONRpcClient.toplevel_ex_handler(e);
-	}
-    }
-
-    while(JSONRpcClient.async_requests.length > 0 &&
-	  JSONRpcClient.num_req_active < JSONRpcClient.max_req_active) {
-	var req = JSONRpcClient.async_requests.shift();
-	if(req.canceled) continue;
-	req.client._sendRequest.call(req.client, req);
-    }
-};
-
-JSONRpcClient.kick_async =
-function JSONRpcClient_kick_async()
-{
-    if(JSONRpcClient.async_timeout == null)
-	JSONRpcClient.async_timeout =
-	    setTimeout(JSONRpcClient._async_handler, 0);
-};
-
-JSONRpcClient.cancelRequest =
-function JSONRpcClient_cancelRequest(requestId)
-{
-    /* If it is in flight then mark it as canceled in the inflight map
-       and the XMLHttpRequest callback will discard the reply. */
-    if(JSONRpcClient.async_inflight[requestId]) {
-	JSONRpcClient.async_inflight[requestId].canceled = true;
-	return true;
-    }
-
-    /* If its not in flight yet then we can just mark it as canceled in
-       the the request queue and it will get discarded before being sent. */
-    for(var i in JSONRpcClient.async_requests) {
-	if(JSONRpcClient.async_requests[i].requestId == requestId) {
-	    JSONRpcClient.async_requests[i].canceled = true;
-	    return true;
-	}
-    }
-
-    /* It may have returned from the network and be waiting for its callback
-       to be dispatched, so mark it as canceled in the response queue
-       and the response will get discarded before calling the callback. */
-    for(var i in JSONRpcClient.async_responses) {
-	if(JSONRpcClient.async_responses[i].requestId == requestId) {
-	    JSONRpcClient.async_responses[i].canceled = true;
-	    return true;
-	}
-    }
-
-    return false;
-};
-
-JSONRpcClient.prototype._makeRequest =
-function JSONRpcClient_makeRequest(methodName, args, cb)
-{
-    var req = {};
-    req.client = this;
-    req.requestId = JSONRpcClient.requestId++;
-
-    var obj = {};
-    obj.id = req.requestId;
-    if (this.objectID)
-	obj.method = ".obj#" + this.objectID + "." + methodName;
-    else
-	obj.method = methodName;
-    obj.params = args;
-
-    if (cb) req.cb = cb;
-    if (JSONRpcClient.profile_async)
-	req.profile = { "submit": new Date() };
-    req.data = toJSON(obj);
-
-    return req;
-};
-
-JSONRpcClient.prototype._sendRequest =
-function JSONRpcClient_sendRequest(req)
-{
-    if(req.profile) req.profile.start = new Date();
-
-    /* Get free http object from the pool */
-    var http = JSONRpcClient.poolGetHTTPRequest();
-    JSONRpcClient.num_req_active++;
-
-    /* Send the request */
-    if (typeof(this.user) == "undefined") {
-	http.open("POST", this.serverURL, (req.cb != null));
-    } else {
-	http.open("POST", this.serverURL, (req.cb != null), this.user, this.pass);
-    }
-
-    /* setRequestHeader is missing in Opera 8 Beta */
-    try { http.setRequestHeader("Content-type", "text/plain"); } catch(e) {}
-
-    /* Construct call back if we have one */
-    if(req.cb) {
-	var self = this;
-	http.onreadystatechange = function() {
-	    if(http.readyState == 4) {
-		http.onreadystatechange = function () {};
-		var res = { "cb": req.cb, "result": null, "ex": null};
-		if (req.profile) {
-		    res.profile = req.profile;
-		    res.profile.end = new Date();
-		}
-		try { res.result = self._handleResponse(http); }
-		catch(e) { res.ex = e; }
-		if(!JSONRpcClient.async_inflight[req.requestId].canceled)
-		    JSONRpcClient.async_responses.push(res);
-		delete JSONRpcClient.async_inflight[req.requestId];
-		JSONRpcClient.kick_async();
-	    }
-	};
-    } else {
-	http.onreadystatechange = function() {};
-    }
-
-    JSONRpcClient.async_inflight[req.requestId] = req;
-	
-    try {
-	http.send(req.data);
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    if(!req.cb) return this._handleResponse(http);
-};
-
-JSONRpcClient.prototype._handleResponse =
-function JSONRpcClient_handleResponse(http)
-{
-    /* Get the charset */
-    if(!this.charset) {
-	this.charset = JSONRpcClient._getCharsetFromHeaders(http);
-    }
-
-    /* Get request results */
-    var status, statusText, data;
-    try {
-	status = http.status;
-	statusText = http.statusText;
-	data = http.responseText;
-    } catch(e) {
-	JSONRpcClient.poolReturnHTTPRequest(http);
-	JSONRpcClient.num_req_active--;
-	JSONRpcClient.kick_async();
-	throw new JSONRpcClient.Exception
-	    (JSONRpcClient.Exception.CODE_ERR_CLIENT, "Connection failed");
-    }
-
-    /* Return http object to the pool; */
-    JSONRpcClient.poolReturnHTTPRequest(http);
-    JSONRpcClient.num_req_active--;
-
-    /* Unmarshall the response */
-    if(status != 200) {
-	throw new JSONRpcClient.Exception(status, statusText);
-    }
-    var obj;
-    try {
-	eval("obj = " + data);
-    } catch(e) {
-	throw new JSONRpcClient.Exception(550, "error parsing result");
-    }
-    if(obj.error)
-	throw new JSONRpcClient.Exception(obj.error.code, obj.error.msg,
-					  obj.error.trace);
-    var res = obj.result;
-
-    /* Handle CallableProxy */
-    if(res && res.objectID && res.JSONRPCType == "CallableReference")
-	return new JSONRpcClient(this.serverURL, this.user,
-				 this.pass, res.objectID);
-
-    return res;
-};
-
-
-/* XMLHttpRequest wrapper code */
-
-/* XMLHttpRequest pool globals */
-JSONRpcClient.http_spare = [];
-JSONRpcClient.http_max_spare = 8;
-
-JSONRpcClient.poolGetHTTPRequest =
-function JSONRpcClient_pool_getHTTPRequest()
-{
-    if(JSONRpcClient.http_spare.length > 0) {
-	return JSONRpcClient.http_spare.pop();
-    }
-    return JSONRpcClient.getHTTPRequest();
-};
-
-JSONRpcClient.poolReturnHTTPRequest =
-function JSONRpcClient_poolReturnHTTPRequest(http)
-{
-    if(JSONRpcClient.http_spare.length >= JSONRpcClient.http_max_spare)
-	delete http;
-    else
-	JSONRpcClient.http_spare.push(http);
-};
-
-JSONRpcClient.msxmlNames = [ "MSXML2.XMLHTTP.5.0",
-			     "MSXML2.XMLHTTP.4.0",
-			     "MSXML2.XMLHTTP.3.0",
-			     "MSXML2.XMLHTTP",
-			     "Microsoft.XMLHTTP" ];
-
-JSONRpcClient.getHTTPRequest =
-function JSONRpcClient_getHTTPRequest()
-{
-    /* Mozilla XMLHttpRequest */
-    try {
-	JSONRpcClient.httpObjectName = "XMLHttpRequest";
-	return new XMLHttpRequest();
-    } catch(e) {}
-
-    /* Microsoft MSXML ActiveX */
-    for (var i=0;i < JSONRpcClient.msxmlNames.length; i++) {
-	try {
-	    JSONRpcClient.httpObjectName = JSONRpcClient.msxmlNames[i];
-	    return new ActiveXObject(JSONRpcClient.msxmlNames[i]);
-	} catch (e) {}
-    }
-
-    /* None found */
-    JSONRpcClient.httpObjectName = null;
-    throw new JSONRpcClient.Exception(0, "Can't create XMLHttpRequest object");
-};
-
-bindingjsonrpc = "loaded";
\ No newline at end of file
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index-plain.html b/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index-plain.html
deleted file mode 100644
index 0783c3facb..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index-plain.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-    * 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.    
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <title>Google Maps JavaScript API Example</title>
-    <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAm88JxNt0WTuRM7JcraL3dBTwM0brOpm-All5BF6PoaKBxRWWERRebL1SxVq4ZL7LvM8MmxNYPufSBA"
-      type="text/javascript"></script>
-    <script type="text/javascript">
-
-    //<![CDATA[
-
-    function load() {
-      if (GBrowserIsCompatible()) {
-        var map = new GMap(document.getElementById("map"));
-        map.addControl(new GLargeMapControl());
-        map.addControl(new GMapTypeControl());
-        map.setCenter(new GLatLng(0,0),0);
-        map.setZoom(1);
-        //map.setCenter(new GLatLng(-15.5833,-56.0833), 13);
-
-      // A function to create the marker and set up the event window
-      function createMarker(point,name,html) {
-        var marker = new GMarker(point);
-        GEvent.addListener(marker, "click", function() {
-          marker.openInfoWindowHtml(html);
-        });
-        return marker;
-      }
-
-      // ================================================================
-      // === JSON handler ===============================================
-      // ================================================================
-      process_it = function(doc) {
-        // === Parse the JSON document === 
-        var jsonData = eval('(' + doc + ')');
-
-        // === Plot the markers ===
-        for (var i=0; i<jsonData.markers.length; i++) {
-          var marker = createMarker(jsonData.markers[i].point, jsonData.markers[i].label, jsonData.markers[i].html);
-          map.addOverlay(marker);
-        }
-      }          
-      
-      // ================================================================
-      // === Fetch the JSON data file ====    
-      GDownloadUrl("map.json", process_it);
-      // ================================================================
-
-
-      }
-    }
-
-    //]]>
-    </script>
-  </head>
-  <body onload="load()" onunload="GUnload()">
-    <div id="map" style="width: 800px; height: 500px"></div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index.html b/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index.html
deleted file mode 100644
index 53f637bed2..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-    * 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.    
--->
-<html>
-<head>
-<title>Customer Mashup</TITLE>
-
-
-<script type="text/javascript" src="binding-jsonrpc.js"></script>
-<script language="JavaScript">
-    //Reference
-	customer = (new JSONRpcClient("http://localhost:8080/CustomerServiceComponent/CustomerService")).CustomerService;
-	
-    function getCustomers() {
-        customer.getCustomers(customer_handleResponse);
-    }
-       
-    function customer_handleResponse(result) {
-		alert(result["p0:dataObject"].CUSTOMER);
-		alert(result["p0:dataObject"].CUSTOMER.NAME["$"]);
-		
-		document.getElementById('result').innerHTML=result;
-	}
-</script>
-
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body>
-
-<h1>MyCompany.com</h1>
-<div id="customer">
-  <h2>Customer List</h2>
-  <input type="button" value="Submit" onclick="getCustomers()" />
-  <div id="result">None yet.</div>
-  <div id="customer_list" ></div>
-</div>
-  
-</body>
-</html>
diff --git a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/map.json b/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/map.json
deleted file mode 100644
index a884141a3c..0000000000
--- a/sandbox/lresende/sca/demos/customer-map/src/main/resources/html/map.json
+++ /dev/null
@@ -1,27 +0,0 @@
-/*

- * 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.    

- */

- 

-{"markers": [

-     {"country":"Brazil", "city":"Cuiaba", "point":new GLatLng(-15.625702586903822, -56.07351064682007), "html":"My home town","label":"Cuiaba"},

-     {"country":"Brazil", "city":"Chapada dos Guimaraes", "point":new GLatLng(-15.44329, -55.75835), "html":"Chapada, Wonderful landscape and beautiful whaterfalls ","label":"Chapada dos Guimaraes"},     

-     {"country":"Brazil", "city":"Pantanal Matogrossense", "point":new GLatLng(-16.223575372658782, -56.631431579589844), "html":"Pantanal and it's amazing biologic diversity","label":"Pantanal Matogrossensse"},

-     {"country":"Brazil", "city":"Rio de Janeiro", "point":new GLatLng(-22.963984709280982, -43.17753553390503), "html":"Wonderful City","label":"Rio de Janeiro"},     

-     {"country":"Brazil", "city":"Sao Paulo", "point":new GLatLng(-23.54329433556302, -46.71802997589111), "html":"Sao Paulo","label":"Sao Paulo"},

-   ]

-}
\ No newline at end of file