You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2011/07/05 01:35:13 UTC

svn commit: r1142870 - in /incubator/photark/branches/photark-rest: photark-jcr/ photark-jcr/src/main/java/org/apache/photark/services/jcr/ photark-jcr/src/test/java/org/apache/photark/services/jcr/ photark-jcr/src/test/resources/ photark/src/main/java...

Author: lresende
Date: Tue Jul  5 01:35:13 2011
New Revision: 1142870

URL: http://svn.apache.org/viewvc?rev=1142870&view=rev
Log:
Flushing out the upload service implementation

Added:
    incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageUploadService.java   (contents, props changed)
      - copied, changed from r1142869, incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageService.java
    incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageUploadService.java   (contents, props changed)
      - copied, changed from r1142869, incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageService.java
Removed:
    incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageService.java
    incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageService.java
Modified:
    incubator/photark/branches/photark-rest/photark-jcr/pom.xml
    incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRBaseTest.java
    incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRGalleryTestCase.java
    incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRImageServiceTestCase.java
    incubator/photark/branches/photark-rest/photark-jcr/src/test/resources/gallery.composite

Modified: incubator/photark/branches/photark-rest/photark-jcr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/pom.xml?rev=1142870&r1=1142869&r2=1142870&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/pom.xml (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/pom.xml Tue Jul  5 01:35:13 2011
@@ -60,17 +60,24 @@
 		<dependency>
 			<groupId>org.apache.jackrabbit</groupId>
 			<artifactId>jackrabbit-core</artifactId>
-			<version>1.6.1</version>
+			<version>1.6.4</version>
 		</dependency>
+	
+		<dependency>
+			<groupId>rhino</groupId>
+			<artifactId>js</artifactId>
+			<version>1.6R5</version>
+			<scope>test</scope>
+		</dependency> 
 
 		<!-- Use Log4J for logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.5.3</version>
+			<version>1.6.1</version>
 		</dependency>
 
-		<dependency>
+		<!-- dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-commonj_1.1_spec</artifactId>
 			<version>1.0</version>
@@ -93,7 +100,7 @@
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 			<version>2.4</version>
-		</dependency>
+		</dependency-->
 
 		<!-- marking dependency as provided to exclude from war file -->
 		<dependency>

Copied: incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageUploadService.java (from r1142869, incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageService.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageUploadService.java?p2=incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageUploadService.java&p1=incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageService.java&r1=1142869&r2=1142870&rev=1142870&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageService.java (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageUploadService.java Tue Jul  5 01:35:13 2011
@@ -24,21 +24,22 @@ import java.util.logging.Logger;
 
 import javax.ws.rs.core.Response;
 
-import org.apache.photark.services.ImageService;
+import org.apache.photark.services.ImageUploadService;
 import org.oasisopen.sca.annotation.Reference;
 import org.oasisopen.sca.annotation.Scope;
 
 @Scope("COMPOSITE")
-public class JCRImageService implements ImageService {
-    private static final Logger logger = Logger.getLogger(JCRImageService.class.getName());
+public class JCRImageUploadService implements ImageUploadService {
+    private static final Logger logger = Logger.getLogger(JCRImageUploadService.class.getName());
 
     private static String supportedImageTypes[] = {".jpg", ".jpeg", ".png", ".gif"};
 
     @Reference(name="repositoryManager")
     private JCRRepositoryManager repositoryManager;
 
-    public void uploadImage(InputStream imageStream) {
-        // TODO Auto-generated method stub
+    public void uploadImage(String albumId, InputStream imageStream) {
+        
+        System.out.println(">>> Inside upload image");
 
     }
 

Propchange: incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageUploadService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRImageUploadService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRBaseTest.java?rev=1142870&r1=1142869&r2=1142870&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRBaseTest.java (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRBaseTest.java Tue Jul  5 01:35:13 2011
@@ -45,6 +45,7 @@ import com.meterware.httpunit.WebRespons
 
 public class JCRBaseTest {
     protected static final String GALLERY_SERVICE_URL = "http://localhost:8085/gallery";
+    protected static final String GALLERY_UPLOAD_SERVICE_URL = "http://localhost:8085/upload";
     protected static final String ALBUM_SERVICE_URL = GALLERY_SERVICE_URL + "/albums";
 
     private static Node node;
@@ -66,8 +67,12 @@ public class JCRBaseTest {
     }
 
     protected void addAlbum() throws IOException, JSONException {
-        JSONObject jsonAlbum = new JSONObject();
         String albumName = getNewAlbumName();
+        addAlbum(albumName);
+    }
+
+    protected void addAlbum(String albumName) throws IOException, JSONException {
+        JSONObject jsonAlbum = new JSONObject();
         jsonAlbum.put("name", albumName);
         jsonAlbum.put("description", "Some description to my album : " + albumName);
 
@@ -76,9 +81,9 @@ public class JCRBaseTest {
         request.setHeaderField("Content-Type", "application/json");
         WebResponse response = wc.getResource(request);
 
-        Assert.assertEquals(204, response.getResponseCode());
+        Assert.assertEquals(204, response.getResponseCode());        
     }
-
+    
     protected String[] readAlbums()  throws IOException, JSONException {
         WebConversation wc = new WebConversation();
         WebRequest request = new GetMethodWebRequest(ALBUM_SERVICE_URL);

Modified: incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRGalleryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRGalleryTestCase.java?rev=1142870&r1=1142869&r2=1142870&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRGalleryTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRGalleryTestCase.java Tue Jul  5 01:35:13 2011
@@ -4,13 +4,7 @@ import java.io.IOException;
 
 import junit.framework.Assert;
 
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
 import org.json.JSONException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.meterware.httpunit.GetMethodWebRequest;
@@ -19,26 +13,6 @@ import com.meterware.httpunit.WebRequest
 import com.meterware.httpunit.WebResponse;
 
 public class JCRGalleryTestCase extends JCRBaseTest {
-    private static final String GALLERY_SERVICE_URL = "http://localhost:8085/gallery";
-    private static final String ALBUM_SERVICE_URL = GALLERY_SERVICE_URL + "/albums";
-
-    private static Node node;
-
-    @BeforeClass
-    public static void BeforeClass() {
-        try {
-            String contribution = ContributionLocationHelper.getContributionLocation("gallery.composite");
-            node = NodeFactory.newInstance().createNode("gallery.composite", new Contribution("gallery", contribution));
-            node.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void AfterClass() {
-        node.stop();
-    }
 
     @Test
     public void testGetAlbums() throws IOException, JSONException {

Modified: incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRImageServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRImageServiceTestCase.java?rev=1142870&r1=1142869&r2=1142870&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRImageServiceTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRImageServiceTestCase.java Tue Jul  5 01:35:13 2011
@@ -19,36 +19,43 @@
 
 package org.apache.photark.services.jcr;
 
-import static org.apache.photark.services.jcr.JCRBaseTest.ALBUM_SERVICE_URL;
-
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
+
+import junit.framework.Assert;
 
 import org.json.JSONException;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
 import com.meterware.httpunit.PostMethodWebRequest;
 import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
 import com.meterware.httpunit.protocol.UploadFileSpec;
 
 public class JCRImageServiceTestCase extends JCRBaseTest {
-   
-
 
     @Test
-    @Ignore
+    //@Ignore
     public void testUploadImage() throws IOException, JSONException, SAXException {
+        //addAlbum("uploads");
+        
         WebConversation wc = new WebConversation();
-        WebRequest request = new PostMethodWebRequest(ALBUM_SERVICE_URL + "/" + getLastAlbumName() + "/images");
+        //PostMethodWebRequest request = new PostMethodWebRequest(ALBUM_SERVICE_URL + "/" + getLastAlbumName() + "/images", true);
+        PostMethodWebRequest request = new PostMethodWebRequest(GALLERY_UPLOAD_SERVICE_URL+ "/albums/uploads/images", true);
 
-        File image = new File("gallery-root/IMG_0735.jpg");
-        final UploadFileSpec ufs = new UploadFileSpec(image,"image/jpeg");
-        request.setParameter("document", new UploadFileSpec[]{ufs});
+        
+        URL imageURL = JCRImageServiceTestCase.class.getResource("/gallery-home/album-1/IMG_0735.jpg");
+        File image = new File(imageURL.getPath());
+        final UploadFileSpec ufs[] = {new UploadFileSpec(image,"image/jpeg")};
+        request.setParameter("image", ufs);
+        request.selectFile("image",image);
 
         WebResponse response = wc.getResponse(request);
+        
+        System.out.println(">>" + response.getResponseCode());
+        
+        Assert.assertTrue(response.getResponseCode() == 204);
     }
 }

Modified: incubator/photark/branches/photark-rest/photark-jcr/src/test/resources/gallery.composite
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/src/test/resources/gallery.composite?rev=1142870&r1=1142869&r2=1142870&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/src/test/resources/gallery.composite (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/src/test/resources/gallery.composite Tue Jul  5 01:35:13 2011
@@ -42,4 +42,14 @@
    		</service>
    		<reference name="repositoryManager" target="RepositoryManager" />
 	</component>
+	
+		<component name="ImageUploadComponent">
+		<implementation.java class="org.apache.photark.services.jcr.JCRImageUploadService"/>
+		<service name="ImageUploadService">
+			<tuscany:binding.rest uri="http://localhost:8085/upload">
+			    <tuscany:operationSelector.jaxrs />
+    		</tuscany:binding.rest>
+   		</service>
+   		<reference name="repositoryManager" target="RepositoryManager" />
+	</component>
 </composite>

Copied: incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageUploadService.java (from r1142869, incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageService.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageUploadService.java?p2=incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageUploadService.java&p1=incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageService.java&r1=1142869&r2=1142870&rev=1142870&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageService.java (original)
+++ incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageUploadService.java Tue Jul  5 01:35:13 2011
@@ -21,8 +21,11 @@ package org.apache.photark.services;
 
 import java.io.InputStream;
 
+import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.oasisopen.sca.annotation.Remotable;
@@ -31,11 +34,12 @@ import org.oasisopen.sca.annotation.Remo
  * @version $Rev$ $Date$
  */
 @Remotable
-public interface ImageService {
+public interface ImageUploadService {
 
     @POST
-    @Path("/images")
-    void uploadImage(InputStream imageStream);
+    @Path("/albums/{albumId}/images")
+    @Consumes(MediaType.MEDIA_TYPE_WILDCARD)
+    void uploadImage(@PathParam("albumId") String albumId, InputStream imageStream);
 
 
     Response getImage(String imageKey);

Propchange: incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageUploadService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/ImageUploadService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date