TUSCANY-2533 - Angela's patch + other fixes in order to make JCR integration work.

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

5 files changed, 284 insertions, 2 deletions

diff --git a/java/sca/samples/photo-gallery/pom.xml b/java/sca/samples/photo-gallery/pom.xml
index e00272e6cb..1c258b47c8 100644
--- a/java/sca/samples/photo-gallery/pom.xml
+++ b/java/sca/samples/photo-gallery/pom.xml
@@ -85,11 +85,53 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
+		<dependency>
+		    <groupId>org.apache.derby</groupId>
+		    <artifactId>derby</artifactId>
+		    <version>10.2.1.6</version>
+		</dependency> 
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+      
+	    <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+		<dependency>
+		    <groupId>javax.jcr</groupId>
+		    <artifactId>jcr</artifactId>
+		    <version>1.0</version>
+		</dependency> 
+
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-core</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-api</artifactId>
+            <version>1.4</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java b/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
index e1a96f9309..1007cd49b0 100644
--- a/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java
+++ b/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
@@ -21,7 +21,7 @@ package launch;
 
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
-public class Launch {
+public class LaunchGallery {
     public static void main(String[] args) throws Exception {
         System.out.println("Starting ...");
         SCADomain scaDomain = SCADomain.newInstance("photo-gallery.composite");
diff --git a/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
new file mode 100644
index 0000000000..d07dc63592
--- /dev/null
+++ b/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
@@ -0,0 +1,34 @@
+/*
+ * 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/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
new file mode 100644
index 0000000000..ac4e6f52f4
--- /dev/null
+++ b/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
@@ -0,0 +1,159 @@
+/*
+ * 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/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
new file mode 100644
index 0000000000..23190de555
--- /dev/null
+++ b/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
@@ -0,0 +1,47 @@
+<?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>