From af380ef0af6e6a034381bebfc4a9a3e0f585f9a3 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 5 Dec 2008 03:30:17 +0000 Subject: Removing JCR support and other clean up preparing to add sample to 1.4 release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723564 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.x/samples/photo-gallery/README | 12 +- .../samples/photo-gallery/photo-gallery.png | Bin 15670 -> 13625 bytes .../samples/photo-gallery/photo-gallery.svg | 158 ++++++-------------- .../sca-java-1.x/samples/photo-gallery/pom.xml | 39 +---- .../src/main/java/launch/LaunchGalleryJCR.java | 34 ----- .../src/main/java/services/jcr/AlbumImpl.java | 159 --------------------- .../src/main/resources/photo-gallery-jcr.composite | 47 ------ 7 files changed, 44 insertions(+), 405 deletions(-) delete mode 100644 branches/sca-java-1.x/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java delete mode 100644 branches/sca-java-1.x/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java delete mode 100644 branches/sca-java-1.x/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite (limited to 'branches/sca-java-1.x') diff --git a/branches/sca-java-1.x/samples/photo-gallery/README b/branches/sca-java-1.x/samples/photo-gallery/README index c66edea985..d32f1d3bd1 100644 --- a/branches/sca-java-1.x/samples/photo-gallery/README +++ b/branches/sca-java-1.x/samples/photo-gallery/README @@ -1,21 +1,13 @@ Photo-Gallery Sample ====================================== -This is a sample store scenario that is used as a getting started guide -for Tuscany SCA. For detailed information, please see: - -http://tuscany.apache.org/getting-started-with-tuscany.html - -or - -http://tuscany.apache.org/getting-started-with-tuscany-using-tuscany-eclipse-plugin.html - +This is a sample picture gallery application using Tuscany SCA. Building And Running The Sample Using Ant ----------------------------------------- With the binary distribution the sample can be built using Ant as follows: -cd store +cd photo-gallery ant compile and then, to run: diff --git a/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.png b/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.png index da413edeee..0e0ae8b9ec 100644 Binary files a/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.png and b/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.png differ diff --git a/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.svg b/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.svg index 74f8ecd36d..9136fef9ad 100644 --- a/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.svg +++ b/branches/sca-java-1.x/samples/photo-gallery/photo-gallery.svg @@ -31,14 +31,15 @@ height="744.09448" id="svg2" sodipodi:version="0.32" - inkscape:version="0.45.1" - sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\store" - sodipodi:docname="store.svg" + inkscape:version="0.45pre1" + sodipodi:docbase="D:\Opensource\Apache\Tuscany\source\java-sca-1.x\samples\photo-gallery" + sodipodi:docname="photo-gallery.svg" version="1.0" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\store\store.png" + inkscape:export-filename="D:\Opensource\Apache\Tuscany\source\java-sca-1.x\samples\photo-gallery\photo-gallery.png" inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84"> + inkscape:export-ydpi="52.84" + sodipodi:modified="true"> store photo-gallery ufs gallery - - ShoppingCart - - CurrencyConverter - - - CurrenyCode HTTP JSONRPC Atom + id="flowPara3378">JSONRPC + Catalog - Album diff --git a/branches/sca-java-1.x/samples/photo-gallery/pom.xml b/branches/sca-java-1.x/samples/photo-gallery/pom.xml index b553179469..87b09ab692 100644 --- a/branches/sca-java-1.x/samples/photo-gallery/pom.xml +++ b/branches/sca-java-1.x/samples/photo-gallery/pom.xml @@ -93,45 +93,10 @@ org.apache.derby derby - 10.2.1.6 + + 10.3.1.4 - - org.slf4j - slf4j-api - 1.3.0 - - - - org.slf4j - slf4j-log4j12 - 1.3.0 - - - - org.slf4j - jcl104-over-slf4j - 1.3.0 - - - - javax.jcr - jcr - 1.0 - - - - org.apache.jackrabbit - jackrabbit-core - 1.4 - - - - org.apache.jackrabbit - jackrabbit-api - 1.4 - - junit junit diff --git a/branches/sca-java-1.x/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java b/branches/sca-java-1.x/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java deleted file mode 100644 index d07dc63592..0000000000 --- a/branches/sca-java-1.x/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-java-1.x/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java b/branches/sca-java-1.x/samples/photo-gallery/src/main/java/services/jcr/AlbumImpl.java deleted file mode 100644 index ac4e6f52f4..0000000000 --- a/branches/sca-java-1.x/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 pictures = new ArrayList(); - - 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-java-1.x/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite b/branches/sca-java-1.x/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite deleted file mode 100644 index 23190de555..0000000000 --- a/branches/sca-java-1.x/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - gallery - boston - - - - - - - - - -- cgit v1.2.3