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 2010/03/15 06:48:31 UTC
svn commit: r923080 - in /incubator/photark/trunk:
photark-jcr/src/main/java/org/apache/photark/jcr/services/
photark-ui-admin/src/main/webapp/admin/ photark-ui/src/main/webapp/
photark-webapp/ photark-webapp/src/main/webapp/WEB-INF/
Author: lresende
Date: Mon Mar 15 06:48:31 2010
New Revision: 923080
URL: http://svn.apache.org/viewvc?rev=923080&view=rev
Log:
Fixing problems with upload ui after moving uploadServices to be a component managed by SCA
Modified:
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageCollectionImpl.java
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js
incubator/photark/trunk/photark-ui/src/main/webapp/constants.js
incubator/photark/trunk/photark-webapp/pom.xml
incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageCollectionImpl.java?rev=923080&r1=923079&r2=923080&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageCollectionImpl.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageCollectionImpl.java Mon Mar 15 06:48:31 2010
@@ -25,7 +25,6 @@ import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.servlet.Servlet;
import org.apache.commons.lang.StringUtils;
import org.apache.photark.services.ImageCollection;
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java?rev=923080&r1=923079&r2=923080&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java Mon Mar 15 06:48:31 2010
@@ -29,6 +29,8 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -41,20 +43,21 @@ import org.apache.commons.fileupload.dis
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.photark.Image;
import org.apache.photark.jcr.util.ArchiveFileExtractor;
-import org.apache.photark.services.ImageUploadService;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.jcr.AlbumImpl;
import org.apache.photark.services.gallery.Gallery;
import org.apache.photark.services.gallery.jcr.GalleryImpl;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
/**
* Servlet responsible for receiving image uploads
* Album name is passed with the post, and should be created in case of new album
*/
+@Service(Servlet.class)
@Scope("COMPOSITE")
-public class JCRImageUploadServiceImpl extends HttpServlet implements ImageUploadService {
+public class JCRImageUploadServiceImpl extends HttpServlet implements Servlet /*ImageUploadService*/ {
private static final Logger logger = Logger.getLogger(JCRImageUploadServiceImpl.class.getName());
private static final long serialVersionUID = -7842318322982743234L;
@@ -73,6 +76,16 @@ public class JCRImageUploadServiceImpl e
upload.setSizeMax(MAX_UPLOAD_ZIP_IN_MEGS * 1024 * 1024);
}
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ response.setContentType("text/html");
+
+ PrintWriter out = response.getWriter();
+ out.write("<html><body><h1>Photark Upload Service</h1></body></html>");
+ }
+
+
+ @Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setContentType("text/html");
Modified: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html?rev=923080&r1=923079&r2=923080&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html (original)
+++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html Mon Mar 15 06:48:31 2010
@@ -21,6 +21,7 @@
<head>
<script type="text/javascript" src="../dojo/dojo.js" djConfig="isDebug:false, parseOnLoad: true, debugAtAllCosts:false"></script>
+<script type="text/javascript" src="../constants.js"></script>
<script type="text/javascript" src="upload.js" charset="utf-8"></script>
<link href="upload.css" rel="stylesheet">
@@ -55,7 +56,7 @@
//gallery json-rpc service
dojo.require("dojo.rpc.JsonService");
- var gallery = new dojo.rpc.JsonService("/photark/Gallery?smd");
+ var gallery = new dojo.rpc.JsonService( photark.constants.GalleryServiceEndpoint );
function populateSelect(){
gallery.getAlbums().addCallback( function(albums, exception) {
Modified: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js?rev=923080&r1=923079&r2=923080&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js (original)
+++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.js Mon Mar 15 06:48:31 2010
@@ -39,7 +39,7 @@ dojo.addOnLoad( function(){
hoverClass:"uploadHover",
activeClass:"uploadPress",
disabledClass:"uploadDisabled",
- uploadUrl:"Upload",
+ uploadUrl:"upload",
fileMask:[
["Jpeg File", "*.jpg;*.jpeg"],
["GIF File", "*.gif"],
Modified: incubator/photark/trunk/photark-ui/src/main/webapp/constants.js
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/src/main/webapp/constants.js?rev=923080&r1=923079&r2=923080&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui/src/main/webapp/constants.js (original)
+++ incubator/photark/trunk/photark-ui/src/main/webapp/constants.js Mon Mar 15 06:48:31 2010
@@ -25,4 +25,10 @@ if (! photark.constants) {
photark.constants = {};
}
-photark.constants.GalleryServiceEndpoint = "GalleryService?smd";
\ No newline at end of file
+photark.constants.contextRoot = "/photark/";
+photark.constants.adminContextRoot = "/photark/admin/";
+
+
+photark.constants.GalleryServiceEndpoint = photark.constants.contextRoot + "GalleryService?smd";
+
+photark.constants.UploadEndpoint = photark.constants.adminContextRoot + "upload";
\ No newline at end of file
Modified: incubator/photark/trunk/photark-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/pom.xml?rev=923080&r1=923079&r2=923080&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/pom.xml (original)
+++ incubator/photark/trunk/photark-webapp/pom.xml Mon Mar 15 06:48:31 2010
@@ -90,13 +90,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http</artifactId>
- <version>2.0-M4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.dojotoolkit</groupId>
<artifactId>dojo</artifactId>
<version>1.3.2</version>
Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite?rev=923080&r1=923079&r2=923080&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite (original)
+++ incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite Mon Mar 15 06:48:31 2010
@@ -22,6 +22,7 @@
targetNamespace="http://org.apache.photoark"
name="photo-gallery-jcr">
+ <!-- Facade component for Gallery -->
<component name="Gallery">
<implementation.java class="org.apache.photark.services.gallery.jcr.GalleryImpl"/>
<property name="name">gallery</property>
@@ -31,6 +32,7 @@
</service>
</component>
+ <!-- Component responsible for providing REST access to images -->
<component name="ImageServiceComponent">
<implementation.java class="org.apache.photark.jcr.services.JCRImageCollectionImpl"/>
<service name="ImageCollection">
@@ -38,4 +40,11 @@
</service>
</component>
+ <!-- Component responsible for providing upload support for gallery/album -->
+ <component name="ImageUploadServiceComponent">
+ <implementation.java class="org.apache.photark.jcr.services.JCRImageUploadServiceImpl"/>
+ <service name="ImageUploadService">
+ <tuscany:binding.http uri="/admin/upload"/>
+ </service>
+ </component>
</composite>