You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/08/08 09:12:56 UTC
svn commit: r683882 - in /tuscany/java/sca/samples/photo-gallery: ./
src/main/java/launch/ src/main/java/services/jcr/ src/main/resources/
Author: lresende
Date: Fri Aug 8 00:12:55 2008
New Revision: 683882
URL: http://svn.apache.org/viewvc?rev=683882&view=rev
Log:
TUSCANY-2533 - Angela's patch + other fixes in order to make JCR integration work.
Added:
tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java (contents, props changed)
- copied, changed from r683865, tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java
tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java (contents, props changed)
- copied, changed from r683865, tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java
tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/
tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java (with props)
tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite (contents, props changed)
- copied, changed from r683858, tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery.composite
Removed:
tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java
Modified:
tuscany/java/sca/samples/photo-gallery/pom.xml
Modified: tuscany/java/sca/samples/photo-gallery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/photo-gallery/pom.xml?rev=683882&r1=683881&r2=683882&view=diff
==============================================================================
--- tuscany/java/sca/samples/photo-gallery/pom.xml (original)
+++ tuscany/java/sca/samples/photo-gallery/pom.xml Fri Aug 8 00:12:55 2008
@@ -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>
Copied: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java (from r683865, tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java?p2=tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java&p1=tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java&r1=683865&r2=683882&rev=683882&view=diff
==============================================================================
--- tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java (original)
+++ tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java Fri Aug 8 00:12:55 2008
@@ -21,7 +21,7 @@
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");
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java (from r683865, tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java?p2=tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java&p1=tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java&r1=683865&r2=683882&rev=683882&view=diff
==============================================================================
--- tuscany/java/sca/samples/photo-gallery/src/main/java/launch/Launch.java (original)
+++ tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java Fri Aug 8 00:12:55 2008
@@ -21,10 +21,10 @@
import org.apache.tuscany.sca.host.embedded.SCADomain;
-public class Launch {
+public class LaunchGalleryJCR {
public static void main(String[] args) throws Exception {
System.out.println("Starting ...");
- SCADomain scaDomain = SCADomain.newInstance("photo-gallery.composite");
+ 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 ...");
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java?rev=683882&view=auto
==============================================================================
--- tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java (added)
+++ tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java Fri Aug 8 00:12:55 2008
@@ -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;
+ }
+ } ///:~
+
+}
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite (from r683858, tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery.composite)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite?p2=tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite&p1=tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery.composite&r1=683858&r2=683882&rev=683882&view=diff
==============================================================================
--- tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery.composite (original)
+++ tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite Fri Aug 8 00:12:55 2008
@@ -33,7 +33,7 @@
</component>
<component name="Album">
- <implementation.java class="services.AlbumImpl"/>
+ <implementation.java class="services.jcr.AlbumImpl"/>
<property name="gallery">gallery</property>
<property name="album">boston</property>
<service name="Album">
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 8 00:12:55 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/photo-gallery/src/main/resources/photo-gallery.composite:671193
Propchange: tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml