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/06/05 19:15:01 UTC
svn commit: r1132480 - in
/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services:
JCRAlbumImpl.java JCRImageUploadServiceImpl.java
Author: lresende
Date: Sun Jun 5 19:15:01 2011
New Revision: 1132480
URL: http://svn.apache.org/viewvc?rev=1132480&view=rev
Log:
Minor formatting and removing unused imports
Modified:
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRAlbumImpl.java
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRAlbumImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRAlbumImpl.java?rev=1132480&r1=1132479&r2=1132480&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRAlbumImpl.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRAlbumImpl.java Sun Jun 5 19:15:01 2011
@@ -23,14 +23,20 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.logging.Logger;
-import javax.jcr.*;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.Value;
import org.apache.photark.Image;
import org.apache.photark.jcr.JCRRepositoryManager;
-import org.apache.photark.security.authorization.Permission;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.ImageFilter;
import org.oasisopen.sca.annotation.Destroy;
@@ -220,7 +226,7 @@ public class JCRAlbumImpl implements Alb
return pictureArray;
}
- private Node getAlbumNode() {
+ private Node getAlbumNode() {
Node albumNode = null;
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=1132480&r1=1132479&r2=1132480&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 Sun Jun 5 19:15:01 2011
@@ -67,192 +67,192 @@ import org.oasisopen.sca.annotation.Serv
@Service(Servlet.class)
@Scope("COMPOSITE")
public class JCRImageUploadServiceImpl extends HttpServlet implements Servlet /*ImageUploadService*/ {
- private static final Logger logger = Logger.getLogger(JCRImageUploadServiceImpl.class.getName());
- private static final long serialVersionUID = -7842318322982743234L;
- public static final long MAX_UPLOAD_ZIP_IN_MEGS = 30;
+ private static final Logger logger = Logger.getLogger(JCRImageUploadServiceImpl.class.getName());
+ private static final long serialVersionUID = -7842318322982743234L;
+ public static final long MAX_UPLOAD_ZIP_IN_MEGS = 30;
- private String supportedImageTypes[] = {".jpg", ".jpeg", ".png", ".gif"};
+ private String supportedImageTypes[] = {".jpg", ".jpeg", ".png", ".gif"};
- private JCRRepositoryManager repositoryManager;
+ private JCRRepositoryManager repositoryManager;
private static AccessManager accessManager;
- private ServletFileUpload upload;
+ private ServletFileUpload upload;
- private Gallery gallery;
+ private Gallery gallery;
- /**
- * Initialize the component.
- */
- @Init
- public void initialize() throws IOException {
- upload = new ServletFileUpload(new DiskFileItemFactory());
- upload.setSizeMax(MAX_UPLOAD_ZIP_IN_MEGS * 1024 * 1024);
- }
-
- public JCRImageUploadServiceImpl() {
-
- }
-
- @Reference(name="repositoryManager")
- protected void setRepositoryManager(JCRRepositoryManager repositoryManager) {
- this.repositoryManager = repositoryManager;
- }
+ /**
+ * Initialize the component.
+ */
+ @Init
+ public void initialize() throws IOException {
+ upload = new ServletFileUpload(new DiskFileItemFactory());
+ upload.setSizeMax(MAX_UPLOAD_ZIP_IN_MEGS * 1024 * 1024);
+ }
+
+ public JCRImageUploadServiceImpl() {
+
+ }
+
+ @Reference(name="repositoryManager")
+ protected void setRepositoryManager(JCRRepositoryManager repositoryManager) {
+ this.repositoryManager = repositoryManager;
+ }
@Reference(name="accessmanager")
- protected void setAccessService(AccessManager accessManager) {
- this.accessManager = accessManager;
- }
-
- @Reference(name="gallery")
- protected void setGallery(Gallery gallery) {
- this.gallery = gallery;
- }
-
- @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>");
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ protected void setAccessService(AccessManager accessManager) {
+ this.accessManager = accessManager;
+ }
+
+ @Reference(name="gallery")
+ protected void setGallery(Gallery gallery) {
+ this.gallery = gallery;
+ }
+
+ @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>");
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setContentType("text/html;charset=UTF-8");
- boolean isMultipartContent = ServletFileUpload.isMultipartContent(request);
- if (!isMultipartContent) {
- try {
- String albumName ="";
- String albumDescription ="";
- //StringBuffer sb = new StringBuffer();
- albumName= (String) request.getParameter("albumName");
- albumDescription= (String) request.getParameter("addAlbumDesc");
-
- if(albumDescription!=null){
- PrintWriter out = response.getWriter();
- if(addDescToAlbum(albumName,albumDescription,request)){
- out.write("albumDescription updated in " + albumName+" with "+albumDescription);
- }else{
- out.write("No permission to add albumDescription in " + albumName);
- }
- out.close();
- return;
- }else{
- return;
- }
- } catch (Exception e) {
- logger.info("Error adding albumDesc : " + e.getMessage());
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error adding albumDesc : " + e.getMessage());
- }
- }
-
- try {
- List<FileItem> fields = (List<FileItem>) upload.parseRequest(request);
- if(logger.isLoggable(Level.INFO)) {
- logger.log(Level.INFO, "Number of fields: " + fields.size());
- }
-
- Iterator<FileItem> fileItems = fields.iterator();
-
- if (!fileItems.hasNext()) {
- if(logger.isLoggable(Level.INFO)) {
- logger.log(Level.INFO, "No fields found");
- }
- return;
- }
-
- String albumName = "";
- String albumDescription= "";
- StringBuffer sb = new StringBuffer();
- while (fileItems.hasNext()) {
- FileItem fileItem = fileItems.next();
- if (fileItem.getFieldName().equalsIgnoreCase("albumName")) {
- albumName = fileItem.getString();
- }
-
- if (fileItem.getFieldName().equalsIgnoreCase("albumDescription")) {
- albumDescription = fileItem.getString();
- }
+ boolean isMultipartContent = ServletFileUpload.isMultipartContent(request);
+ if (!isMultipartContent) {
+ try {
+ String albumName ="";
+ String albumDescription ="";
+ //StringBuffer sb = new StringBuffer();
+ albumName= (String) request.getParameter("albumName");
+ albumDescription= (String) request.getParameter("addAlbumDesc");
+
+ if(albumDescription!=null){
+ PrintWriter out = response.getWriter();
+ if(addDescToAlbum(albumName,albumDescription,request)){
+ out.write("albumDescription updated in " + albumName+" with "+albumDescription);
+ }else{
+ out.write("No permission to add albumDescription in " + albumName);
+ }
+ out.close();
+ return;
+ }else{
+ return;
+ }
+ } catch (Exception e) {
+ logger.info("Error adding albumDesc : " + e.getMessage());
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error adding albumDesc : " + e.getMessage());
+ }
+ }
+
+ try {
+ List<FileItem> fields = (List<FileItem>) upload.parseRequest(request);
+ if(logger.isLoggable(Level.INFO)) {
+ logger.log(Level.INFO, "Number of fields: " + fields.size());
+ }
+
+ Iterator<FileItem> fileItems = fields.iterator();
+
+ if (!fileItems.hasNext()) {
+ if(logger.isLoggable(Level.INFO)) {
+ logger.log(Level.INFO, "No fields found");
+ }
+ return;
+ }
+
+ String albumName = "";
+ String albumDescription= "";
+ StringBuffer sb = new StringBuffer();
+ while (fileItems.hasNext()) {
+ FileItem fileItem = fileItems.next();
+ if (fileItem.getFieldName().equalsIgnoreCase("albumName")) {
+ albumName = fileItem.getString();
+ }
+
+ if (fileItem.getFieldName().equalsIgnoreCase("albumDescription")) {
+ albumDescription = fileItem.getString();
+ }
if (fileItem.getFieldName().equalsIgnoreCase("securityToken")&&request.getSession().getAttribute(ACCESS_LIST)==null) {
- request.getSession().setAttribute(ACCESS_LIST, accessManager.getAccessListFromSecurityToken(fileItem.getString())) ;
- }
+ request.getSession().setAttribute(ACCESS_LIST, accessManager.getAccessListFromSecurityToken(fileItem.getString())) ;
+ }
- boolean isFormField = fileItem.isFormField();
+ boolean isFormField = fileItem.isFormField();
- if (!isFormField) {
- String fileName = fileItem.getName();
+ if (!isFormField) {
+ String fileName = fileItem.getName();
- if(logger.isLoggable(Level.INFO)) {
- logger.log(Level.INFO, "fileName:"+fileName);
- }
-
-
- InputStream inStream = new BufferedInputStream(fileItem.getInputStream());
- List<Image> pictures = new ArrayList<Image>();
-
- if (isArchive(inStream)) {
- ArchiveFileExtractor archiveFileExtractor = new ArchiveFileExtractor(supportedImageTypes);
- pictures = archiveFileExtractor.extractArchive(inStream);
- } else {
- // this is a picture file and not the archive file
- Image picture = new Image(fileName, new Date(), inStream);
- pictures.add(picture);
- }
-
- for (Image picture : pictures) {
- addPictureToAlbum(albumName,albumDescription, picture,request); //todo
- }
- sb.append("file=uploaded/" + fileName);
- sb.append(",name=" + fileName);
- //sb.append(",error=Not recognized file type");
- }
- }
-
- PrintWriter out = response.getWriter();
- out.write(sb.toString());
-
- } catch (FileUploadException e) {
- logger.info("Error uploading file : " + e.getMessage());
- response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Error uploading file : " + e.getMessage());
- } catch (Exception e) {
- logger.info("Error uploading file : " + e.getMessage());
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error uploading file : " + e.getMessage());
- }
- }
+ if(logger.isLoggable(Level.INFO)) {
+ logger.log(Level.INFO, "fileName:"+fileName);
+ }
+
+
+ InputStream inStream = new BufferedInputStream(fileItem.getInputStream());
+ List<Image> pictures = new ArrayList<Image>();
+
+ if (isArchive(inStream)) {
+ ArchiveFileExtractor archiveFileExtractor = new ArchiveFileExtractor(supportedImageTypes);
+ pictures = archiveFileExtractor.extractArchive(inStream);
+ } else {
+ // this is a picture file and not the archive file
+ Image picture = new Image(fileName, new Date(), inStream);
+ pictures.add(picture);
+ }
+
+ for (Image picture : pictures) {
+ addPictureToAlbum(albumName,albumDescription, picture,request); //todo
+ }
+ sb.append("file=uploaded/" + fileName);
+ sb.append(",name=" + fileName);
+ //sb.append(",error=Not recognized file type");
+ }
+ }
+
+ PrintWriter out = response.getWriter();
+ out.write(sb.toString());
+
+ } catch (FileUploadException e) {
+ logger.info("Error uploading file : " + e.getMessage());
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Error uploading file : " + e.getMessage());
+ } catch (Exception e) {
+ logger.info("Error uploading file : " + e.getMessage());
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error uploading file : " + e.getMessage());
+ }
+ }
@Override
- protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- response.setContentType("text/html");
+ protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ response.setContentType("text/html");
String albumName ="";
- String imageName ="";
- //StringBuffer sb = new StringBuffer();
- albumName= (String) request.getParameter("albumName");
- imageName= (String) request.getParameter("imageName");
-
-
- deleteNode(albumName, imageName,request); //todo
- PrintWriter out = response.getWriter();
-
- //sb.append("deleted " + albumName+"/"+imageName);
- //out.write(sb.toString());
- out.write("deleted " + albumName+"/"+imageName);
- out.close();
-
- }
-
- /**
- * @param albumName String
- * @param albumDescription Picture
- * @param image albumDescription
+ String imageName ="";
+ //StringBuffer sb = new StringBuffer();
+ albumName= (String) request.getParameter("albumName");
+ imageName= (String) request.getParameter("imageName");
+
+
+ deleteNode(albumName, imageName,request); //todo
+ PrintWriter out = response.getWriter();
+
+ //sb.append("deleted " + albumName+"/"+imageName);
+ //out.write(sb.toString());
+ out.write("deleted " + albumName+"/"+imageName);
+ out.close();
+
+ }
+
+ /**
+ * @param albumName String
+ * @param albumDescription Picture
+ * @param image albumDescription
*/
private void addPictureToAlbum(String albumName, String albumDescription, Image image, HttpServletRequest request) {
Album album = new JCRAlbumImpl(repositoryManager, albumName);
String userId= ((AccessList) request.getSession().getAttribute(ACCESS_LIST)).getUserId();
- if (!gallery.hasAlbum(albumName)) {
+ if (!gallery.hasAlbum(albumName)) {
if (accessManager.isPermitted(userId, albumName, new String[]{ALBUM_CREATE_PERMISSION})){
gallery.addAlbum(albumName);
album.addOwner(userId);
@@ -270,14 +270,14 @@ public class JCRImageUploadServiceImpl e
}
- /**
- * @param albumName the name of the album
- * @param albumDescription the album description that need to be added
+ /**
+ * @param albumName the name of the album
+ * @param albumDescription the album description that need to be added
* @param request the HttpServletRequest
* @return boolean
- */
+ */
private boolean addDescToAlbum(String albumName, String albumDescription, HttpServletRequest request) {
- // AccessList accessList= jsonSecurityManager.getAccessListFromUserId(((AccessList) request.getSession().getAttribute(ACCESS_LIST)).getUserId());
+ // AccessList accessList= jsonSecurityManager.getAccessListFromUserId(((AccessList) request.getSession().getAttribute(ACCESS_LIST)).getUserId());
if (accessManager.isPermitted(((AccessList) request.getSession().getAttribute(ACCESS_LIST)).getUserId(), albumName, new String[]{ALBUM_EDIT_ALBUM_DESCRIPTION_PERMISSION})) {
gallery.addAlbum(albumName);
@@ -292,40 +292,40 @@ public class JCRImageUploadServiceImpl e
}
/**
- *
- * @param albumName
- * @param imageName
- */
- private void deleteNode(String albumName, String imageName, HttpServletRequest request) {
- String userId= ((AccessList) request.getSession().getAttribute(ACCESS_LIST)).getUserId();
- if(imageName==null){
- if (accessManager.isPermitted(userId, albumName, null)) {
+ *
+ * @param albumName
+ * @param imageName
+ */
+ private void deleteNode(String albumName, String imageName, HttpServletRequest request) {
+ String userId= ((AccessList) request.getSession().getAttribute(ACCESS_LIST)).getUserId();
+ if(imageName==null){
+ if (accessManager.isPermitted(userId, albumName, null)) {
- gallery.deleteAlbum(albumName);
- }
- }else{
- if (accessManager.isPermitted(userId, albumName, new String[]{ALBUM_DELETE_IMAGES_PERMISSION})) {
+ gallery.deleteAlbum(albumName);
+ }
+ }else{
+ if (accessManager.isPermitted(userId, albumName, new String[]{ALBUM_DELETE_IMAGES_PERMISSION})) {
- Album album = new JCRAlbumImpl(repositoryManager, albumName);
- album.deletePicture(imageName);
- }
- }
- }
+ Album album = new JCRAlbumImpl(repositoryManager, albumName);
+ album.deletePicture(imageName);
+ }
+ }
+ }
- /**
- * Test whether this stream is of archive or not
- *
- * @param inStream InputStream
- * @return boolean
- */
- private static boolean isArchive(InputStream inStream) {
- ArchiveStreamFactory streamFactory = new ArchiveStreamFactory();
- try {
- streamFactory.createArchiveInputStream(inStream);
- return true;
- } catch (ArchiveException e) {
- logger.info("File is not an archive");
- }
- return false;
- }
+ /**
+ * Test whether this stream is of archive or not
+ *
+ * @param inStream InputStream
+ * @return boolean
+ */
+ private static boolean isArchive(InputStream inStream) {
+ ArchiveStreamFactory streamFactory = new ArchiveStreamFactory();
+ try {
+ streamFactory.createArchiveInputStream(inStream);
+ return true;
+ } catch (ArchiveException e) {
+ logger.info("File is not an archive");
+ }
+ return false;
+ }
}
\ No newline at end of file