Starting to clean up android branch, creating subsets of samples, demos, tutorials that can be ported to android.

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

30 files changed, 0 insertions, 701 deletions

diff --git a/branches/sca-android/samples/photo-gallery/src/main/java/launch/LaunchGallery.java b/branches/sca-android/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
deleted file mode 100644
index 1007cd49b0..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/java/launch/LaunchGallery.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 LaunchGallery {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("photo-gallery.composite");
-        System.out.println("photo.gallery.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/branches/sca-android/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/branches/sca-android/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
deleted file mode 100644
index d07dc63592..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.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 LaunchGalleryJCR {
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ...");
-        SCADomain scaDomain = SCADomain.newInstance("photo-gallery-jcr.composite");
-        System.out.println("photo.gallery.composite ready for big business !!!");
-        System.in.read();
-        System.out.println("Stopping ...");
-        scaDomain.close();
-        System.out.println();
-    }
-}
diff --git a/branches/sca-android/samples/photo-gallery/src/main/java/services/Album.java b/branches/sca-android/samples/photo-gallery/src/main/java/services/Album.java
deleted file mode 100644
index 5257d0e703..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/java/services/Album.java
+++ /dev/null
@@ -1,29 +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 services;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Album {
-    
-    public String[] getPictures();
-
-}
diff --git a/branches/sca-android/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/branches/sca-android/samples/photo-gallery/src/main/java/services/AlbumImpl.java
deleted file mode 100644
index dd2b086e29..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/java/services/AlbumImpl.java
+++ /dev/null
@@ -1,95 +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 services;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-
-public class AlbumImpl implements Album {
-    private String gallery;
-    private String album;
-    private String location;
-    private List<String> pictures = new ArrayList<String>();
-    
-    @Property
-    public void setGallery(String gallery) {
-        this.gallery = gallery;
-        this.location = null;
-    }
-    @Property
-    public void setAlbum(String album) {
-        this.album = album;
-        this.location = null;
-    }
-    
-    protected String getLocation() {
-        if (location == null) {
-            location = gallery + "/" + album + "/"; 
-        }
-        return location;
-        
-    }
-
-    @Init
-    public void init() {
-        try {
-            URL albumURL = this.getClass().getClassLoader().getResource(getLocation());
-            if(albumURL != null) {
-                File album = new File(albumURL.toURI());
-                if (album.isDirectory() && album.exists()) {
-                    String[] listPictures = album.list(new ImageFilter(".jpg"));
-                    for(String image : listPictures) {
-                        image = getLocation() + image;
-                        pictures.add(image);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            // FIXME: ignore for now
-            e.printStackTrace();
-        }   
-    }
-    
-    public String[] getPictures() {
-        String[] pictureArray = new String[pictures.size()];
-        pictures.toArray(pictureArray);
-        return pictureArray;
-    }
-    
-    /**
-     * Inner fileFilter class
-     */
-    private class ImageFilter implements FilenameFilter {
-        String afn;
-        ImageFilter(String afn) { this.afn = afn; }
-        public boolean accept(File dir, String name) {
-          // Strip path information:
-          String f = new File(name).getName();
-          return f.indexOf(afn) != -1;
-        }
-      } ///:~ 
-
-}
diff --git a/branches/sca-android/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/branches/sca-android/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
deleted file mode 100644
index ac4e6f52f4..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
+++ /dev/null
@@ -1,159 +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 services.jcr;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.Repository;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
-import org.apache.jackrabbit.core.TransientRepository;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-
-import services.Album;
-
-public class AlbumImpl implements Album {
-    private String gallery;
-    private String album;
-    private String location;
-    private Repository repository=null;
-    private Session session=null;
-    
-    @Property
-    public void setGallery(String gallery) {
-        this.gallery = gallery;
-        this.location = null;
-    }
-    @Property
-    public void setAlbum(String album) {
-        this.album = album;
-        this.location = null;
-    }
-    
-    protected String getLocation() {
-        if (location == null) {
-            location = gallery + "/" + album + "/"; 
-        }
-        return location;
-        
-    }
-
-    @Init
-    public void init() {
-        try {
-            URL albumURL = this.getClass().getClassLoader().getResource(getLocation());
-            if(albumURL != null) {
-            	repository = new TransientRepository();
-                session = repository.login(
-                    new SimpleCredentials("username", "password".toCharArray()));
-                try {
-                  File album = new File(albumURL.toURI());
-                  if (album.isDirectory() && album.exists()) {
-                      String[] listPictures = album.list(new ImageFilter(".jpg"));
-                    for(String image : listPictures) {
-                    	Node root=session.getRootNode();
-                    	Node picNode=root.addNode(image);
-                        InputStream inFile = getClass().getClassLoader().getResourceAsStream(getLocation()+image);
-                        picNode.setProperty("image", inFile );
-                        picNode.setProperty("name", image);
-                        picNode.setProperty("location", getLocation()+image);
-                    	//image = getLocation() + image;
-                        //pictures.add(image);
-                      }
-                  }
-                            
-                  session.save();
-                }catch (Exception e){
-                    // FIXME: ignore for now
-                    e.printStackTrace();     	
-                }
-            }
-        } catch (Exception e) {
-            // FIXME: ignore for now
-            e.printStackTrace();
-        }   
-    }
-    
-    public String[] getPictures() {
-      List<String> pictures = new ArrayList<String>();
-    	
-      try{	
-    	Node root=session.getRootNode();
-        NodeIterator nodes = root.getNodes();
-
-        while(nodes.hasNext()){
-        	Node node=nodes.nextNode();
-        	if(node.getPath().equals("/jcr:system")) continue;
-        	
-        	pictures.add(node.getProperty("location").getString());
-        	//System.out.println(node.getProperty("name").getString());
-        	//System.out.println(node.getPath());
-        }
-      }catch (Exception e) {
-          // FIXME: ignore for now
-          e.printStackTrace();
-      }
-      
-      String[] pictureArray = new String[pictures.size()];
-      pictures.toArray(pictureArray);
-      removeNodes();
-      return pictureArray;
-    }
-    
-    
-    public void removeNodes(){
-      try{
-    	Node root=session.getRootNode();
-        NodeIterator nodes = root.getNodes();
-        while(nodes.hasNext()){
-        	Node node=nodes.nextNode();
-        	if(node.getPath().equals("/jcr:system")) continue;
-        	else node.remove();
-        }
-        session.save();
-      }catch (Exception e) {
-          // FIXME: ignore for now
-          e.printStackTrace();
-      }
-        
-    }
-    /**
-     * Inner fileFilter class
-     */
-    private class ImageFilter implements FilenameFilter {
-        String afn;
-        ImageFilter(String afn) { this.afn = afn; }
-        public boolean accept(File dir, String name) {
-          // Strip path information:
-          String f = new File(name).getName();
-          return f.indexOf(afn) != -1;
-        }
-      } ///:~ 
-
-}
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery.html b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery.html
deleted file mode 100644
index f6566e88ec..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery.html
+++ /dev/null
@@ -1,135 +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>Photo Gallery</title>
-
-<link href="styles.css" rel="stylesheet">
-
-<script type="text/javascript" src="gallery.js"></script>
-<script language="JavaScript">
-
-	//@Reference
-	var album = new Reference("album");
-		
-	var albumItems;
-	var currPos = 0;
-
-	function album_getResponse(items, exception) {
-		if(exception) {
-			alert(exception.msg);
-			return;
-		}
-		albumItems = items;
-		showAlbum();
-	}
-
-   function showImage(pos) {
-   	var img = document.createElement("img");
-	img.onload = function(evt) {
-		document.getElementById("albumImage").src = this.src;
-        document.getElementById("albumImage").width=this.width;
-        document.getElementById("albumImage").height=this.height;
-    }
-    img.src = albumItems[pos];
-    return false;   	
-   }
-   
-   function showAlbum() {
-      if(albumItems.length > 0) {
-		showImage(currPos);
-	  }	
-   }
-   
-   function goNext() {
-   	 if(currPos < albumItems.length) {
-	 	currPos++;
-		showImage(currPos);
-	 }
-   }
-   
-   function goPrevious() {
-   	if(currPos > 0) {
-		currPos--;
-		showImage(currPos);
-	}
-   }	
-		
-	function init() {
-		try {
-			album.getPictures(album_getResponse);
-		} catch(exception) {
-			alert(e);
-		}
-	}
-	
-	
-	index_off= new Image(31,31); index_off.src = "index.gif";
-    index_on = new Image(31,31); index_on.src = "index_on.gif";
-    next_off = new Image(31,31); next_off.src = "next.gif";
-	next_on  = new Image(31,31); next_on.src = "next_on.gif";
-	prev_off = new Image(31,31); prev_off.src = "prev.gif";
-	prev_on  = new Image(31,31); prev_on.src = "prev_on.gif";
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<br>
-<h1><center>Apache Tuscany Photo Gallery</center></h1>
-<br>
-<br>
-  <div id="gallery">
-	<div id="album">
-		<!--img id="albumImage" border="0" src=""-->
-	</div>
-	<br>
-  </div>
-  
-  <center>
-
-  <table style="height:54px;" cellspacing="0" cellpadding="0" border="0">
-     <tr>
-     	<td valign="middle">
-     	   <!-- Navigation Header -->
-		   <table style="width:100%;" cellspacing="0" cellpadding="0" border="0">
-             <tr>
-             	<td style="width:31px;"><a href="javascript:showAlbum()" onmouseover="document.index.src=index_on.src" onmouseout="document.index.src=index_off.src"><img src="index.gif" width="31" height="31" border="0" title="Index page" name="index" alt=""></a></td>
-                <td style="width:31px;"><a href="javascript:goPrevious()" onmouseover="document.previous.src=prev_on.src" onmouseout="document.previous.src=prev_off.src"><img src="prev.gif" width="31" height="31" border="0" title="Previous image" name="previous" alt=""></a></td>
-                <td style="width:31px;"><a href="javascript:goNext()" onmouseover="document.next.src=next_on.src" onmouseout="document.next.src=next_off.src"><img src="next.gif" width="31" height="31" border="0" title="Next image" name="next" alt=""></a></td>
-                <td style="width:31px;"><a href="javascript:void(0)" onmouseover="show_over();" onmouseout="show_out();" onmousedown="show_down();" ondblclick="change_delay();"><img src="show_slide.gif" width="31" height="31" border="0" title="Start/Stop slideshow - DoubleClick to change speed" name="show" alt=""></a></td>
-             </tr>
-		   </table>
-		</td>
-	</tr>
-  </table>
-
-  <table style="width:720px;" border="0" cellspacing="0" cellpadding="0">
-    <tr>
-     	<td align="center"> <!-- Image without original -->
-        <img id="albumImage" src="space.gif" class="slideImage" width="720" height="540" ondragstart="return false" onselectstart="return false" oncontextmenu="return false" galleryimg="no" usemap="#imagemap" alt="">
-		</td>
-    </tr>
-  </table>
-		   
-  </center>
-  
-</body>
-</html>
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
deleted file mode 100644
index 9437b321e2..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
deleted file mode 100644
index 07f37ec505..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
deleted file mode 100644
index 2193784271..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
deleted file mode 100644
index 1532ee2c1b..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
deleted file mode 100644
index 17ffd73aec..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
deleted file mode 100644
index 19e9ec37df..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
deleted file mode 100644
index 022416dbce..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
deleted file mode 100644
index c78a974714..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
deleted file mode 100644
index a98070925a..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
deleted file mode 100644
index dc83889116..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg b/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
deleted file mode 100644
index 0e33548135..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/index.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/index.gif
deleted file mode 100755
index 7599ac7686..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/index.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/index_on.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/index_on.gif
deleted file mode 100755
index 153e9879d6..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/index_on.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/next.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/next.gif
deleted file mode 100755
index 002eaf6951..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/next.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/next_disabled.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/next_disabled.gif
deleted file mode 100755
index 38b1298453..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/next_disabled.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/next_on.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/next_on.gif
deleted file mode 100755
index 4e5bb3e7ef..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/next_on.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/branches/sca-android/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
deleted file mode 100644
index 23190de555..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
+++ /dev/null
@@ -1,47 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://photo-gallery"
-		name="photo-gallery">
-		
-    <component name="Gallery">
-        <t:implementation.widget location="gallery.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/gallery"/>
-        </service>
-		<reference name="album" target="Album">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="Album">
-		<implementation.java class="services.jcr.AlbumImpl"/> 
-		<property name="gallery">gallery</property>
-		<property name="album">boston</property>
-		<service name="Album">
-			<t:binding.jsonrpc/>
-   		</service>
-	</component> 
-	
-	<component name="GalleryPictures">
-		<t:implementation.resource location="gallery"></t:implementation.resource>
-	</component>
-</composite>
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/photo-gallery.composite b/branches/sca-android/samples/photo-gallery/src/main/resources/photo-gallery.composite
deleted file mode 100644
index 0bb3c4b4db..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/photo-gallery.composite
+++ /dev/null
@@ -1,47 +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:t="http://tuscany.apache.org/xmlns/sca/1.0"
-		targetNamespace="http://photo-gallery"
-		name="photo-gallery">
-		
-    <component name="Gallery">
-        <t:implementation.widget location="gallery.html"/>
-        <service name="Widget">
-        	<t:binding.http uri="/gallery"/>
-        </service>
-		<reference name="album" target="Album">
-		 	<t:binding.jsonrpc/>
-		 </reference>
-    </component>
-    
-	<component name="Album">
-		<implementation.java class="services.AlbumImpl"/> 
-		<property name="gallery">gallery</property>
-		<property name="album">boston</property>
-		<service name="Album">
-			<t:binding.jsonrpc/>
-   		</service>
-	</component> 
-	
-	<component name="GalleryPictures">
-		<t:implementation.resource location="gallery"></t:implementation.resource>
-	</component>
-</composite>
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/prev.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/prev.gif
deleted file mode 100755
index 4eea10f1dc..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/prev.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/prev_disabled.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/prev_disabled.gif
deleted file mode 100755
index 7e35f07076..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/prev_disabled.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/prev_on.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/prev_on.gif
deleted file mode 100755
index 3ef9a776bb..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/prev_on.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/show_slide.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/show_slide.gif
deleted file mode 100644
index a5b6a15c2b..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/show_slide.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/space.gif b/branches/sca-android/samples/photo-gallery/src/main/resources/space.gif
deleted file mode 100644
index 170fe82b65..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/space.gif
+++ /dev/null
diff --git a/branches/sca-android/samples/photo-gallery/src/main/resources/styles.css b/branches/sca-android/samples/photo-gallery/src/main/resources/styles.css
deleted file mode 100755
index d23d949858..0000000000
--- a/branches/sca-android/samples/photo-gallery/src/main/resources/styles.css
+++ /dev/null
@@ -1,121 +0,0 @@
-body {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #888888;
-	background-color: #000000;
-	margin-top: 0px;
-}
-
-html {
-	scrollbar-face-color:#444444;
-	scrollbar-highlight-color:#000000;
-	scrollbar-3dlight-color:#000000;
-	scrollbar-darkshadow-color:#000000;
-	scrollbar-shadow-color:#000000;
-	scrollbar-arrow-color:#888888;
-	scrollbar-track-color:#000000;
-}
-
-a:link {
-	text-decoration: none;
- 	color: #AAAAAA;
-}
-
-a:visited {
-	text-decoration: none;
-	color: #AAAAAA;
-}
-
-a:hover {
-	text-decoration: none;
-	color: #FFFFFF;
-}
-
-.current {
-	font-weight: bold;
- 	color: #AAAAAA;
-	background-color: #666666;
-}
-
-.cthumb {
-	background-color: #666666;
-	border: 0px; border-width: 0px;
-}
-
-.thumb {
-	background-color: #333333;
-	border: 0px; border-width: 0px;
-}
-
-.image { margin: 0px; border-width: 1px; border: 1px solid;}
-a:link .image { border-color: #aaaaaa; color: #aaaaaa;}
-a:visited .image { border-color: #666666; color: #666666;}
-a:hover .image { border-color: #ffffff; color: #ffffff;}
-
-.slideImage { border-width: 0px; border: 0px solid; border-color: #ffffff;}
-a:link .slideImage { border-color: #ffffff;}
-a:visited .slideImage { border-color: #ffffff;}
-
-.title {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	font-weight: bold;
-	color: #000000;
-}
-
-.title a:link {
-	text-decoration: none;
-	color: #000000;
-}
-
-.title a:visited {
-	text-decoration: none;
-	color: #000000;
-}
-
-.title a:hover {
-	text-decoration: none;
-	color: #ffffff;
-}
-
-.infotable {
-	border: 1px solid #444444;
-	border-collapse: collapse;
-}
-
-.infotable td {
-	border: 1px solid #444444;
-}
-
-.infotable table td {
-	border: 0px;
-}
-
-.dirname {
-	font-size: 12px;
-	font-weight: bold;
-	color: #AAAAAA;
-}
-
-.comment {
-	color: #CCCCCC;
-	font-weight: bold;
-	font-size: 12px;
-}
-
-.smalltxt {
-	color: #888888;
-	font-size: 11px;
-}
-
-.xsmalltxt {
-	color: #888888;
-	font-size: 9px;
-}
-
-.newlabel {
-	font-size: 8px;
-	font-weight: bold;
-	color: #EEEEEE;
-	background-color: #558800;
-}
\ No newline at end of file