svn commit: r1052521 [3/8] - in /ofbiz/trunk: ./ applications/order/ applications/product/ applications/product/config/ applications/product/data/ applications/product/data/helpdata/ applications/product/entitydef/ applications/product/lib/ application...

[hansbak-2]

Added: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java?rev=1052521&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java (added)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java Fri Dec 24 15:22:49 2010
@@ -0,0 +1,869 @@
+/*******************************************************************************
+ * 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 org.ofbiz.product.imagemanagement;
+
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.ImagingOpException;
+import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import javolution.util.FastList;
+import javolution.util.FastMap;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.jdom.JDOMException;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.FileUtil;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilGenerics;
+import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.base.util.string.FlexibleStringExpander;
+import org.ofbiz.common.image.ImageTransform;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.webapp.event.EventHandlerException;
+
+
+/**
+ * Product Services
+ */
+public class ImageManagementServices {
+
+    public static final String module = ImageManagementServices.class.getName();
+    public static final String resource = "ProductErrorUiLabels";
+    private static List<Map<String,Object>> josonMap = null;
+
+    public static Map<String, Object> addMultipleuploadForProduct(DispatchContext dctx, Map<String, ? extends Object> context)
+    throws IOException, JDOMException {
+        
+        Map<String, Object> result = FastMap.newInstance();
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        GenericValue userLogin = (GenericValue) context.get("userLogin");
+        String productId = (String) context.get("productId");
+        productId = productId.trim();
+        String productContentTypeId = (String) context.get("productContentTypeId");
+        ByteBuffer imageData = (ByteBuffer) context.get("uploadedFile");
+        String uploadFileName = (String) context.get("_uploadedFile_fileName");
+        String imageResize = (String) context.get("imageResize");
+        
+        if (UtilValidate.isNotEmpty(uploadFileName)) {
+            String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
+            String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+            String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
+            
+            String rootTargetDirectory = imageServerPath + "/products/management";
+            File rootTargetDir = new File(rootTargetDirectory);
+            if (!rootTargetDir.exists()) {
+                boolean created = rootTargetDir.mkdirs();
+                if (!created) {
+                    String errMsg = "Not create target directory";
+                    Debug.logFatal(errMsg, module);
+                    return ServiceUtil.returnError(errMsg);
+                }
+            }
+            
+            String sizeType = null;
+            if (UtilValidate.isNotEmpty(imageResize)) {
+                if (imageResize.equals("IMAGE_AVATAR")) {
+                    sizeType = "100x75";
+                } else if (imageResize.equals("IMAGE_THUMBNAIL")) {
+                    sizeType = "150x112";
+                }    
+                else if (imageResize.equals("IMAGE_WEBSITE")) {
+                    sizeType = "320x240";
+                }
+                else if (imageResize.equals("IMAGE_BOARD")) {
+                    sizeType = "640x480";
+                }
+                else if (imageResize.equals("IMAGE_MONITOR15")) {
+                    sizeType = "800x600";
+                }
+                else if (imageResize.equals("IMAGE_MONITOR17")) {
+                    sizeType = "1024x768";
+                }
+                else if (imageResize.equals("IMAGE_MONITOR19")) {
+                    sizeType = "1280x1024";
+                }
+                else if (imageResize.equals("IMAGE_MONITOR21")) {
+                    sizeType = "1600x1200";
+                }
+            }
+        
+            Map<String, Object> contentCtx = FastMap.newInstance();
+            contentCtx.put("contentTypeId", "DOCUMENT");
+            contentCtx.put("userLogin", userLogin);
+            Map<String, Object> contentResult = FastMap.newInstance();
+            try {
+                contentResult = dispatcher.runSync("createContent", contentCtx);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+            
+            String contentId = (String) contentResult.get("contentId");
+            result.put("contentFrameId", contentId);
+            result.put("contentId", (String) context.get("contentId"));
+            result.put("dataResourceId", (String) context.get("dataResourceId"));
+            
+            // File to use for image original
+            FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
+            String fileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "type", sizeType, "id", contentId));
+            String filePathPrefix = "";
+            String filenameToUse = fileLocation;
+            if (fileLocation.lastIndexOf("/") != -1) {
+                filePathPrefix = fileLocation.substring(0, fileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
+                filenameToUse = fileLocation.substring(fileLocation.lastIndexOf("/") + 1);
+            }
+            
+            String fileContentType = (String) context.get("_uploadedFile_contentType");
+            if (fileContentType.equals("image/pjpeg")) {
+                fileContentType = "image/jpeg";
+            } else if (fileContentType.equals("image/x-png")) {
+                fileContentType = "image/png";
+            }
+        
+            List<GenericValue> fileExtension = FastList.newInstance();
+            try {
+                fileExtension = delegator.findByAnd("FileExtension", UtilMisc.toMap("mimeTypeId", fileContentType ));
+            } catch (GenericEntityException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+        
+            GenericValue extension = EntityUtil.getFirst(fileExtension);
+            if (extension != null) {
+                filenameToUse += "." + extension.getString("fileExtensionId");
+            }
+            
+            // Create folder product id.
+            String targetDirectory = imageServerPath + "/products/management/" + productId;
+            File targetDir = new File(targetDirectory);
+            if (!targetDir.exists()) {
+                boolean created = targetDir.mkdirs();
+                if (!created) {
+                    String errMsg = "Not create target directory";
+                    Debug.logFatal(errMsg, module);
+                    return ServiceUtil.returnError(errMsg);
+                }
+            }
+        
+            // Create image file original to folder product id.
+            File file = new File(imageServerPath + "/products/management/" + productId + "/" + filenameToUse);
+            
+            try {
+                RandomAccessFile out = new RandomAccessFile(file, "rw");
+                out.write(imageData.array());
+                out.close();
+            } catch (FileNotFoundException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError("Unable to open file for writing: " + file.getAbsolutePath());
+            } catch (IOException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError("Unable to write binary data to: " + file.getAbsolutePath());
+            }
+            
+            // Scale Image in different sizes
+            if (UtilValidate.isNotEmpty(imageResize)) {
+                File fileOriginal = new File(imageServerPath + "/products/management/" + filenameToUse);
+                try {
+                    RandomAccessFile outFile = new RandomAccessFile(fileOriginal, "rw");
+                    outFile.write(imageData.array());
+                    outFile.close();
+                } catch (FileNotFoundException e) {
+                    Debug.logError(e, module);
+                    return ServiceUtil.returnError("Unable to open file for writing: " + file.getAbsolutePath());
+                } catch (IOException e) {
+                    Debug.logError(e, module);
+                    return ServiceUtil.returnError("Unable to write binary data to: " + file.getAbsolutePath());
+                }
+                
+                Map<String, Object> resultResize = FastMap.newInstance();
+                try {
+                    resultResize.putAll(ImageManagementServices.scaleImageMangementInAllSize(context, filenameToUse, sizeType, productId));
+                } catch (IOException e) {
+                    String errMsg = "Scale additional image in all different sizes is impossible : " + e.toString();
+                    Debug.logError(e, errMsg, module);
+                    return ServiceUtil.returnError(errMsg);
+                } catch (JDOMException e) {
+                    String errMsg = "Errors occur in parsing ImageProperties.xml : " + e.toString();
+                    Debug.logError(e, errMsg, module);
+                    return ServiceUtil.returnError(errMsg);
+                }
+            }
+            
+            Map<String, Object> contentThumbnail = createContentThumbnail(dctx, context, userLogin, imageData, productId);
+            String filenameToUseThumb = (String) contentThumbnail.get("filenameToUseThumb");
+            String contentIdThumb = (String) contentThumbnail.get("contentIdThumb");
+            
+            String imageUrl = "/images/products/management/" + productId + "/" + filenameToUse;
+            String imageUrlThumb = "/images/products/management/" + productId + "/" + filenameToUseThumb;
+            
+            createContentAndDataResource(dctx, userLogin, filenameToUse, imageUrl, contentId);
+            createContentAndDataResource(dctx, userLogin, filenameToUseThumb, imageUrlThumb, contentIdThumb);
+            
+            Map<String, Object> createContentAssocMap = FastMap.newInstance();
+            createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL");
+            createContentAssocMap.put("contentId", contentId);
+            createContentAssocMap.put("contentIdTo", contentIdThumb);
+            createContentAssocMap.put("userLogin", userLogin);
+            try {
+                dispatcher.runSync("createContentAssoc", createContentAssocMap);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+            
+            Map<String, Object> productContentCtx = FastMap.newInstance();
+            productContentCtx.put("productId", productId);
+            productContentCtx.put("productContentTypeId", productContentTypeId);
+            productContentCtx.put("fromDate", UtilDateTime.nowTimestamp());
+            productContentCtx.put("userLogin", userLogin);
+            productContentCtx.put("contentId", contentId);
+            productContentCtx.put("statusId", "IM_PENDING");
+            try {
+                dispatcher.runSync("createProductContent", productContentCtx);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+            
+            Map<String, Object> partyContentCtx = FastMap.newInstance();
+            partyContentCtx.put("contentId", contentId);
+            partyContentCtx.put("userLogin", userLogin);
+            try {
+                dispatcher.runSync("createImagePartyContent", partyContentCtx);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+        }
+        return result;
+    }
+
+    public static Map<String, Object> removeImageFileForImageManagement(DispatchContext dctx, Map<String, ? extends Object> context){
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        GenericValue userLogin = (GenericValue) context.get("userLogin");
+        String contentId = (String) context.get("contentId");
+        String dataResourceName = (String) context.get("dataResourceName");
+        String productId = (String) context.get("productId");
+    
+        try {
+            if (UtilValidate.isNotEmpty(contentId)) {
+                String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
+                String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+                FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
+                String fileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "type", "management/" + productId , "id", contentId));
+                String filePathPrefix = "";
+                String filenameToUse = fileLocation;
+            
+                if (fileLocation.lastIndexOf("/") != -1) {
+                    filePathPrefix = fileLocation.substring(0, fileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
+                    filenameToUse = fileLocation.substring(fileLocation.lastIndexOf("/") + 1);
+                }
+            
+                String fileName = dataResourceName;
+                if (fileName.lastIndexOf(".") > 0) {
+                    String fileType  = fileName.substring(fileName.lastIndexOf("."));
+                    if (fileType.equals(".jpeg") || fileType.equals(".jpg")) {
+                        filenameToUse += ".jpg";
+                    } else {
+                    filenameToUse += fileName.substring(fileName.lastIndexOf("."));
+                    }
+                }
+            
+                File file = new File(imageServerPath + "/products/management/" + productId + "/" + filenameToUse);
+                file.delete();
+            }
+        } catch (Exception e) {
+            return ServiceUtil.returnError(e.getMessage());
+        }
+        return ServiceUtil.returnSuccess();
+    }
+    
+    public static Map<String, Object> scaleImageMangementInAllSize(Map<String, ? extends Object> context, String filenameToUse, String resizeType, String productId)
+        throws IllegalArgumentException, ImagingOpException, IOException, JDOMException {
+    
+        /* VARIABLES */
+        Locale locale = (Locale) context.get("locale");
+        List<String> sizeTypeList = null;
+        if (UtilValidate.isNotEmpty(resizeType)) {
+            sizeTypeList  = UtilMisc.toList(resizeType);
+        } else {
+            sizeTypeList = UtilMisc.toList("small","100x75", "150x112", "320x240", "640x480", "800x600", "1024x768", "1280x1024", "1600x1200");
+        }
+        
+        int index;
+        Map<String, Map<String, String>> imgPropertyMap = FastMap.newInstance();
+        BufferedImage bufImg, bufNewImg;
+        double imgHeight, imgWidth;
+        Map<String, String> imgUrlMap = FastMap.newInstance();
+        Map<String, Object> resultXMLMap = FastMap.newInstance();
+        Map<String, Object> resultBufImgMap = FastMap.newInstance();
+        Map<String, Object> resultScaleImgMap = FastMap.newInstance();
+        Map<String, Object> result = FastMap.newInstance();
+    
+        /* ImageProperties.xml */
+        String imgPropertyFullPath = System.getProperty("ofbiz.home") + "/applications/product/config/ImageProperties.xml";
+        resultXMLMap.putAll((Map<String, Object>) ImageTransform.getXMLValue(imgPropertyFullPath, locale));
+        if (resultXMLMap.containsKey("responseMessage") && resultXMLMap.get("responseMessage").equals("success")) {
+            imgPropertyMap.putAll(UtilGenerics.<Map<String, Map<String, String>>>cast(resultXMLMap.get("xml")));
+        } else {
+            String errMsg = UtilProperties.getMessage(resource, "ScaleImage.unable_to_parse", locale) + " : ImageProperties.xml";
+            Debug.logError(errMsg, module);
+            result.put("errorMessage", errMsg);
+            return result;
+        }
+    
+        /* IMAGE */
+        // get Name and Extension
+        index = filenameToUse.lastIndexOf(".");
+        String imgName = filenameToUse.substring(0, index - 1);
+        String imgExtension = filenameToUse.substring(index + 1);
+        // paths
+        String mainFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
+        String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+        String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
+    
+        String id = imgName;
+        String type = "management";
+    
+        FlexibleStringExpander mainFilenameExpander = FlexibleStringExpander.getInstance(mainFilenameFormat);
+        String fileLocation = mainFilenameExpander.expandString(UtilMisc.toMap("location", "products", "type", type, "id", filenameToUse));
+        String filePathPrefix = "";
+        if (fileLocation.lastIndexOf("/") != -1) {
+            filePathPrefix = fileLocation.substring(0, fileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
+        }
+        
+        /* get original BUFFERED IMAGE */
+        resultBufImgMap.putAll(ImageTransform.getBufferedImage(imageServerPath + "/" + filePathPrefix + filenameToUse, locale));
+    
+        if (resultBufImgMap.containsKey("responseMessage") && resultBufImgMap.get("responseMessage").equals("success")) {
+            bufImg = (BufferedImage) resultBufImgMap.get("bufferedImage");
+    
+            // get Dimensions
+            imgHeight = (double) bufImg.getHeight();
+            imgWidth = (double) bufImg.getWidth();
+            if (imgHeight == 0.0 || imgWidth == 0.0) {
+                String errMsg = UtilProperties.getMessage(resource, "ScaleImage.one_current_image_dimension_is_null", locale) + " : imgHeight = " + imgHeight + " ; imgWidth = " + imgWidth;
+                Debug.logError(errMsg, module);
+                result.put("errorMessage", errMsg);
+                return result;
+            }
+    
+            // new Filename Format
+            FlexibleStringExpander addFilenameExpander = mainFilenameExpander;
+    
+            /* scale Image for each Size Type */
+            Iterator<String> sizeIter = sizeTypeList.iterator();
+            while (sizeIter.hasNext()) {
+                String sizeType = sizeIter.next();
+    
+                resultScaleImgMap.putAll(ImageTransform.scaleImage(bufImg, imgHeight, imgWidth, imgPropertyMap, sizeType, locale));
+    
+                if (resultScaleImgMap.containsKey("responseMessage") && resultScaleImgMap.get("responseMessage").equals("success")) {
+                    bufNewImg = (BufferedImage) resultScaleImgMap.get("bufferedImage");
+    
+                    // write the New Scaled Image
+                    String newFileLocation = null;
+                    newFileLocation = mainFilenameExpander.expandString(UtilMisc.toMap("location", "products", "type", "/management/"+ productId, "id", id));
+                    
+                    String newFilePathPrefix = "";
+                    if (newFileLocation.lastIndexOf("/") != -1) {
+                        newFilePathPrefix = newFileLocation.substring(0, newFileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
+                    }
+    
+                    String targetDirectory = imageServerPath + "/" + newFilePathPrefix;
+                    File targetDir = new File(targetDirectory);
+                    if (!targetDir.exists()) {
+                        boolean created = targetDir.mkdirs();
+                        if (!created) {
+                            String errMsg = UtilProperties.getMessage(resource, "ScaleImage.unable_to_create_target_directory", locale) + " - " + targetDirectory;
+                            Debug.logFatal(errMsg, module);
+                            return ServiceUtil.returnError(errMsg);
+                        }
+                    }
+                    
+                    // write new image
+                    try {
+                        ImageIO.write((RenderedImage) bufNewImg, imgExtension, new File(imageServerPath + "/" + newFilePathPrefix + filenameToUse));
+                        File deleteFile = new File(imageServerPath + "/products/management/" + filenameToUse);
+                        deleteFile.delete();
+                    } catch (IllegalArgumentException e) {
+                        String errMsg = UtilProperties.getMessage(resource, "ScaleImage.one_parameter_is_null", locale) + e.toString();
+                        Debug.logError(errMsg, module);
+                        result.put("errorMessage", errMsg);
+                        return result;
+                    } catch (IOException e) {
+                        String errMsg = UtilProperties.getMessage(resource, "ScaleImage.error_occurs_during_writing", locale) + e.toString();
+                        Debug.logError(errMsg, module);
+                        result.put("errorMessage", errMsg);
+                        return result;
+                    }
+    
+                    /* write Return Result */
+                    String imageUrl = imageUrlPrefix + "/" + newFilePathPrefix + filenameToUse;
+                    imgUrlMap.put(sizeType, imageUrl);
+    
+                } // scaleImgMap
+            } // sizeIter
+    
+            result.put("responseMessage", "success");
+            result.put("imageUrlMap", imgUrlMap);
+            result.put("original", resultBufImgMap);
+            return result;
+    
+        } else {
+            String errMsg = UtilProperties.getMessage(resource, "ScaleImage.unable_to_scale_original_image", locale) + " : " + filenameToUse;
+            Debug.logError(errMsg, module);
+            result.put("errorMessage", errMsg);
+            return ServiceUtil.returnError(errMsg);
+        }
+    }
+  
+    public static Map<String, Object> createContentAndDataResource(DispatchContext dctx, GenericValue userLogin, String filenameToUse, String imageUrl, String contentId){
+        Map<String, Object> result = FastMap.newInstance();
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        
+        Map<String, Object> dataResourceCtx = FastMap.newInstance();
+        
+        dataResourceCtx.put("objectInfo", imageUrl);
+        dataResourceCtx.put("dataResourceName", filenameToUse);
+        dataResourceCtx.put("userLogin", userLogin);
+        dataResourceCtx.put("dataResourceTypeId", "SHORT_TEXT");
+        dataResourceCtx.put("mimeTypeId", "text/html");
+        dataResourceCtx.put("isPublic", "Y");
+    
+        Map<String, Object> dataResourceResult = FastMap.newInstance();
+        try {
+            dataResourceResult = dispatcher.runSync("createDataResource", dataResourceCtx);
+        } catch (GenericServiceException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+    
+        result.put("dataResourceFrameId", dataResourceResult.get("dataResourceId"));
+    
+        Map<String, Object> contentUp = FastMap.newInstance();
+        contentUp.put("contentId", contentId);
+        contentUp.put("dataResourceId", dataResourceResult.get("dataResourceId"));
+        contentUp.put("contentName", filenameToUse);
+        contentUp.put("userLogin", userLogin);
+        try {
+            dispatcher.runSync("updateContent", contentUp);
+        } catch (GenericServiceException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+    
+        GenericValue content = null;
+        try {
+            content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), false);
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+    
+        if (content != null) {
+            GenericValue dataResource = null;
+            try {
+                dataResource = content.getRelatedOne("DataResource");
+            } catch (GenericEntityException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+        
+            if (dataResource != null) {
+                dataResourceCtx.put("dataResourceId", dataResource.getString("dataResourceId"));
+                try {
+                    dispatcher.runSync("updateDataResource", dataResourceCtx);
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    return ServiceUtil.returnError(e.getMessage());
+                }
+            }
+        }
+        return result;
+    }
+    
+    public static Map<String, Object> createContentThumbnail(DispatchContext dctx, Map<String, ? extends Object> context, GenericValue userLogin, ByteBuffer imageData, String productId){
+        Map<String, Object> result = FastMap.newInstance();
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
+        String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+        String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
+        
+        // Create content for thumbnail
+        Map<String, Object> contentThumb = FastMap.newInstance();
+        contentThumb.put("contentTypeId", "DOCUMENT");
+        contentThumb.put("userLogin", userLogin);
+        Map<String, Object> contentThumbResult = FastMap.newInstance();
+        try {
+            contentThumbResult = dispatcher.runSync("createContent", contentThumb);
+        } catch (GenericServiceException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+        
+        String contentIdThumb = (String) contentThumbResult.get("contentId");
+        result.put("contentIdThumb", contentIdThumb);
+        
+        // File to use for image thumbnail
+        FlexibleStringExpander filenameExpanderThumb = FlexibleStringExpander.getInstance(imageFilenameFormat);
+        String fileLocationThumb = filenameExpanderThumb.expandString(UtilMisc.toMap("location", "products", "type", "small", "id", contentIdThumb));
+        String filePathPrefixThumb = "";
+        String filenameToUseThumb = fileLocationThumb;
+        if (fileLocationThumb.lastIndexOf("/") != -1) {
+            filePathPrefixThumb = fileLocationThumb.substring(0, fileLocationThumb.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
+            filenameToUseThumb = fileLocationThumb.substring(fileLocationThumb.lastIndexOf("/") + 1);
+        }
+    
+        String fileContentType = (String) context.get("_uploadedFile_contentType");
+        if (fileContentType.equals("image/pjpeg")) {
+            fileContentType = "image/jpeg";
+        } else if (fileContentType.equals("image/x-png")) {
+            fileContentType = "image/png";
+        }
+        
+        List<GenericValue> fileExtensionThumb = FastList.newInstance();
+        try {
+            fileExtensionThumb = delegator.findByAnd("FileExtension", UtilMisc.toMap("mimeTypeId", fileContentType));
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+        
+        GenericValue extensionThumb = EntityUtil.getFirst(fileExtensionThumb);
+        if (extensionThumb != null) {
+            filenameToUseThumb += "." + extensionThumb.getString("fileExtensionId");
+        }
+        result.put("filenameToUseThumb", filenameToUseThumb);
+        // Create image file thumbnail to folder product id.
+        File fileOriginalThumb = new File(imageServerPath + "/products/management/" + filenameToUseThumb);
+        try {
+            RandomAccessFile outFileThumb = new RandomAccessFile(fileOriginalThumb, "rw");
+            outFileThumb.write(imageData.array());
+            outFileThumb.close();
+        } catch (FileNotFoundException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError("Unable to open file for writing: " + fileOriginalThumb.getAbsolutePath());
+        } catch (IOException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError("Unable to write binary data to: " + fileOriginalThumb.getAbsolutePath());
+        }
+        
+        Map<String, Object> resultResizeThumb = FastMap.newInstance();
+        try {
+            resultResizeThumb.putAll(ImageManagementServices.scaleImageMangementInAllSize(context, filenameToUseThumb, "medium", productId));
+        } catch (IOException e) {
+            String errMsg = "Scale additional image in all different sizes is impossible : " + e.toString();
+            Debug.logError(e, errMsg, module);
+            return ServiceUtil.returnError(errMsg);
+        } catch (JDOMException e) {
+            String errMsg = "Errors occur in parsing ImageProperties.xml : " + e.toString();
+            Debug.logError(e, errMsg, module);
+            return ServiceUtil.returnError(errMsg);
+        }
+        return result;
+    }
+    
+    public static Map<String, Object> resizeImageThumbnail(BufferedImage bufImg, double imgHeight, double imgWidth) {
+
+        /* VARIABLES */
+        BufferedImage bufNewImg;
+        double defaultHeight, defaultWidth, scaleFactor;
+        Map<String, Object> result = FastMap.newInstance();
+
+        /* DIMENSIONS from ImageProperties */
+        defaultHeight = 100;
+        defaultWidth = 100;
+
+        /* SCALE FACTOR */
+        // find the right Scale Factor related to the Image Dimensions
+        if (imgHeight > imgWidth) {
+            scaleFactor = defaultHeight / imgHeight;
+            
+            // get scaleFactor from the smallest width
+            if (defaultWidth < (imgWidth * scaleFactor)) {
+                scaleFactor = defaultWidth / imgWidth;
+            }
+        } else {
+            scaleFactor = defaultWidth / imgWidth;
+            // get scaleFactor from the smallest height
+            if (defaultHeight < (imgHeight * scaleFactor)) {
+                scaleFactor = defaultHeight / imgHeight;
+            }
+        }
+
+        int bufImgType;
+        if (BufferedImage.TYPE_CUSTOM == bufImg.getType()) {
+            // apply a type for image majority
+            bufImgType = BufferedImage.TYPE_INT_ARGB_PRE;
+        } else {
+            bufImgType = bufImg.getType();
+        }
+
+        // scale original image with new size
+        Image newImg = bufImg.getScaledInstance((int) (imgWidth * scaleFactor), (int) (imgHeight * scaleFactor), Image.SCALE_SMOOTH);
+
+        bufNewImg = ImageTransform.toBufferedImage(newImg, bufImgType);
+
+        result.put("bufferedImage", bufNewImg);
+        result.put("scaleFactor", scaleFactor);
+        return result;
+    }
+    
+    public static String multipleUploadImage(HttpServletRequest request, HttpServletResponse response) throws IOException, JDOMException {
+        Locale locale = UtilHttp.getLocale(request);
+        HttpSession session = request.getSession(true);
+        GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
+        Delegator delegator = (Delegator) request.getAttribute("delegator");
+        LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+        
+        Map formInput = FastMap.newInstance();
+        Map<String, Object> results = FastMap.newInstance();
+        ServletFileUpload fu = new ServletFileUpload(new DiskFileItemFactory(10240, FileUtil.getFile("runtime/tmp")));
+        java.util.List lst = null;
+        try {
+           lst = fu.parseRequest(request);
+        } catch (FileUploadException e4) {
+            return e4.getMessage();
+        }
+                
+        FileItem fi = null;
+        FileItem imageFi = null;
+        byte[] imageBytes = {};
+        for (int i=0; i < lst.size(); i++) {
+            fi = (FileItem)lst.get(i);
+            String fn = fi.getName();
+            String fieldName = fi.getFieldName();
+            if (fi.isFormField()) {
+                String fieldStr = fi.getString();
+                formInput.put(fieldName, fieldStr);
+            } else if (fieldName.startsWith("imageData")) {
+                Map<String, Object> passedParams = FastMap.newInstance();
+                Map<String, Object> contentLength = FastMap.newInstance();
+                if(josonMap == null){
+                     josonMap = FastList.newInstance();
+                }
+                imageFi = fi;
+                String fileName = fi.getName();
+                String contentType = fi.getContentType();
+                imageBytes = imageFi.get();
+                ByteBuffer byteWrap = ByteBuffer.wrap(imageBytes);
+                passedParams.put("userLogin", userLogin);
+                passedParams.put("productId", formInput.get("productId"));
+                passedParams.put("productContentTypeId", "IMAGE");
+                passedParams.put("_uploadedFile_fileName", fileName);
+                passedParams.put("_uploadedFile_contentType", contentType);
+                passedParams.put("uploadedFile", byteWrap);
+                passedParams.put("imageResize", formInput.get("imageResize"));
+                contentLength.put("imageSize", imageFi.getSize());
+                josonMap.add(contentLength);
+                
+                if (passedParams.get("productId") != null) {
+                    try {
+                        dispatcher.runSync("addMultipleuploadForProduct", passedParams);
+                    } catch (GenericServiceException e) {
+                        Debug.logError(e, module);
+                        return e.getMessage();
+                    }
+                }
+                
+            }
+        }
+        return "success";
+    }
+    
+    public static String progressUploadImage(HttpServletRequest request, HttpServletResponse response) throws EventHandlerException{
+        toJsonObjectList(josonMap,response);
+        josonMap.clear();
+        return "success";
+    }
+    
+    public static void toJsonObject(Map<String,Object> attrMap, HttpServletResponse response){
+        JSONObject json = JSONObject.fromObject(attrMap);
+        String jsonStr = json.toString();
+        if (jsonStr == null) {
+            Debug.logError("JSON Object was empty; fatal error!",module);
+        }
+        // set the X-JSON content type
+        response.setContentType("application/json");
+        // jsonStr.length is not reliable for unicode characters
+        try {
+            response.setContentLength(jsonStr.getBytes("UTF8").length);
+        } catch (UnsupportedEncodingException e) {
+            Debug.logError("Problems with Json encoding",module);
+        }
+        // return the JSON String
+        Writer out;
+        try {
+            out = response.getWriter();
+            out.write(jsonStr);
+            out.flush();
+        } catch (IOException e) {
+            Debug.logError("Unable to get response writer",module);
+        }
+    }
+    
+    public static void toJsonObjectList(List<Map<String,Object>> list, HttpServletResponse response) throws EventHandlerException {
+        JSONObject json = null;
+        List<JSONObject> jsonList = new ArrayList<JSONObject>();
+        if (list != null) {
+            for (Map<String,Object> val : list) {
+                json = new JSONObject();
+                for (String rowKey: val.keySet()) {
+                    json.put(rowKey, val.get(rowKey));
+                }
+                jsonList.add(json);
+            }
+            String jsonStr = jsonList.toString();
+            if (jsonStr == null) {
+                throw new EventHandlerException("JSON Object was empty; fatal error!");
+            }
+            // set the X-JSON content type
+            response.setContentType("application/json");
+            // jsonStr.length is not reliable for unicode characters
+            try {
+                response.setContentLength(jsonStr.getBytes("UTF8").length);
+            } catch (UnsupportedEncodingException e) {
+                throw new EventHandlerException("Problems with Json encoding", e);
+            }
+            // return the JSON String
+            Writer out;
+            try {
+                out = response.getWriter();
+                out.write(jsonStr);
+                out.flush();
+            } catch (IOException e) {
+                throw new EventHandlerException("Unable to get response writer", e);
+            }
+        }
+    }
+    
+    public static Map<String, Object> setThumbnail(DispatchContext dctx, Map<String, ? extends Object> context) {
+        Map<String, Object> result = FastMap.newInstance();
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        GenericValue userLogin = (GenericValue) context.get("userLogin");
+        String productId = (String) context.get("productId");
+        String contentIdTo = (String) context.get("contentIdTo");
+        
+        try {
+            if (UtilValidate.isNotEmpty(contentIdTo)) {
+                String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
+                String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+                
+                FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
+                String fileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "type", "small", "id", productId));
+                String filePathPrefix = "";
+                String filenameToUse = fileLocation;
+                if (fileLocation.lastIndexOf("/") != -1) {
+                    filePathPrefix = fileLocation.substring(0, fileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
+                    filenameToUse = fileLocation.substring(fileLocation.lastIndexOf("/") + 1);
+                }
+                
+                GenericValue content = null;
+                try {
+                    content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentIdTo), false);
+                } catch (GenericEntityException e) {
+                    Debug.logError(e, module);
+                    return ServiceUtil.returnError(e.getMessage());
+                }
+                
+                String contentName = (String) content.get("contentName");
+                
+                if (contentName.lastIndexOf(".") > 0 && contentName.lastIndexOf(".") < contentName.length()) {
+                    filenameToUse += contentName.substring(contentName.lastIndexOf("."));
+                } else {
+                    filenameToUse += ".jpg";
+                }
+                
+                try {
+                    File f1 = new File(imageServerPath + "/products/management/" + productId + "/" + contentName);
+                    File f2 = new File(imageServerPath + "/" + filePathPrefix, filenameToUse);
+                    InputStream input = new FileInputStream(f1);
+                    OutputStream out = new FileOutputStream(f2);
+                    
+                    byte[] buf = new byte[1024];
+                    int len;
+                    while ((len = input.read(buf)) > 0){
+                      out.write(buf, 0, len);
+                    }
+                    input.close();
+                    out.close();
+                    
+                    Map<String, Object> updateProductMap = FastMap.newInstance();
+                    updateProductMap.put("userLogin", userLogin);
+                    updateProductMap.put("productId", productId);
+                    updateProductMap.put("smallImageUrl", "/images/products/small/" + filenameToUse);
+                    try {
+                        dispatcher.runSync("updateProduct", updateProductMap);
+                    } catch (GenericServiceException e) {
+                        Debug.logError(e, module);
+                        return ServiceUtil.returnError(e.getMessage());
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } catch (Exception e) {
+            return ServiceUtil.returnError(e.getMessage());
+        }
+        return ServiceUtil.returnSuccess();
+    }
+}

Added: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java?rev=1052521&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java (added)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java Fri Dec 24 15:22:49 2010
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * 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 org.ofbiz.product.imagemanagement;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import javolution.util.FastList;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.StringUtil;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.service.ServiceUtil;
+
+/**
+ * ControlServlet.java - Master servlet for the web application.
+ */
+@SuppressWarnings("serial")
+public class ImageUrlServlet extends HttpServlet {
+
+    public static final String module = ImageUrlServlet.class.getName();
+
+    public ImageUrlServlet() {
+        super();
+    }
+
+    /**
+     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+     */
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+    }
+
+    /**
+     * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    @Override
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    /**
+     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    @Override
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Delegator delegator = (Delegator) getServletContext().getAttribute("delegator");
+
+        String pathInfo = request.getPathInfo();
+        List<String> pathElements = StringUtil.split(pathInfo, "/");
+        
+        String lastPathElement = pathElements.get(pathElements.size() - 1);
+        
+        List<String> tagElements = FastList.newInstance();
+        for (String pathElement : pathElements) {
+            tagElements.addAll(StringUtil.split(pathElement, "-"));
+        }
+        
+        String lastTagElement = tagElements.get(tagElements.size() - 1);
+        String contentId = lastTagElement.substring(0, lastTagElement.lastIndexOf("."));
+        String sizeTagElement = tagElements.get(tagElements.size() - 2);
+        
+        GenericValue content = null;
+        try {
+            GenericValue contentResult = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), false);
+            if (contentResult == null) {
+                content = delegator.findOne("Content", UtilMisc.toMap("contentId", sizeTagElement), false);
+            } else {
+                content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), false);
+            }
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+        }
+    
+        GenericValue dataResource = null;
+        try {
+            dataResource = content.getRelatedOne("DataResource");
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+        }
+        
+        String imageUrl = dataResource.getString("objectInfo");
+        RequestDispatcher rd = request.getRequestDispatcher("/control/viewImage?drObjectInfo=" + imageUrl);
+        rd.forward(request, response);
+    }
+
+    /**
+     * @see javax.servlet.Servlet#destroy()
+     */
+    @Override
+    public void destroy() {
+        super.destroy();
+    }
+
+}

Added: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java?rev=1052521&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java (added)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java Fri Dec 24 15:22:49 2010
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * 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 org.ofbiz.product.imagemanagement;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javolution.util.FastMap;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.base.util.string.FlexibleStringExpander;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceUtil;
+
+import watermarker.exception.WatermarkerException;
+import watermarker.impl.DefaultWatermarker;
+import watermarker.model.WatermarkerSettings;
+
+public class ReplaceImage{
+
+    public static final String module = ReplaceImage.class.getName();
+    public static final String resource = "ProductErrorUiLabels";
+
+    public static String replaceImageToExistImage(HttpServletRequest request, HttpServletResponse response) throws MalformedURLException, FileNotFoundException, WatermarkerException, GenericEntityException, GenericServiceException {
+        Map<String, ? extends Object> context = request.getParameterMap();
+        String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+        LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+        Delegator delegator = (Delegator) request.getAttribute("delegator");
+        GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
+        String productId = request.getParameter("productId");
+        String imageName = request.getParameter("imageName");
+        String contentIdExist = request.getParameter("contentIdExist");
+        String contentIdReplace = request.getParameter("contentIdReplace");
+        if (UtilValidate.isNotEmpty(imageName)) {
+            if (UtilValidate.isNotEmpty(contentIdReplace)) {
+                if (contentIdExist.equals(contentIdReplace)) {
+                    String errMsg = "Cannot replace because both images are the same image.";
+                    request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                    return "error";
+                }
+            }
+            else{
+                String errMsg = "Please choose image to replace.";
+                request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                return "error";
+            }
+        }
+        else{
+            String errMsg = "Please choose replacement image.";
+            request.setAttribute("_ERROR_MESSAGE_", errMsg);
+            return "error";
+        }
+        
+        try {
+            File file = new File(imageServerPath + "/products/management/" + productId + "/" + imageName);
+            file.delete();
+            
+            URL imageUrl = new URL("file:" + imageServerPath + "/products/management/" + productId + "/" + contentIdReplace + ".jpg");
+            File outputImageFile = new File(imageServerPath + "/products/management/" + productId + "/" + imageName);
+            OutputStream outputStream = new FileOutputStream(outputImageFile);
+            WatermarkerSettings watermarkerSettings = WatermarkerSettings.DEFAULT;
+            new DefaultWatermarker().watermark(imageUrl, " ", outputStream, watermarkerSettings);
+            
+            List<GenericValue> contentAssocExistList = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", contentIdExist, "contentAssocTypeId", "IMAGE_THUMBNAIL"));
+            GenericValue contentAssocExist = EntityUtil.getFirst(contentAssocExistList);
+            
+            List<GenericValue> contentAssocReplaceList = delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentId", contentIdReplace, "contentAssocTypeId", "IMAGE_THUMBNAIL"));
+            GenericValue contentAssocReplace = EntityUtil.getFirst(contentAssocReplaceList);
+            
+            URL imageThumbnailUrl = new URL("file:" + imageServerPath + "/products/management/" + productId + "/" + contentAssocReplace.get("contentIdTo") + ".jpg");
+            File outputImageThumbnailFile = new File(imageServerPath + "/products/management/" + productId + "/" + contentAssocExist.get("contentIdTo") + ".jpg");
+            OutputStream outputStreamThumbnail = new FileOutputStream(outputImageThumbnailFile);
+            new DefaultWatermarker().watermark(imageThumbnailUrl, " ", outputStreamThumbnail, watermarkerSettings);
+            
+            List<GenericValue> productContentList = delegator.findByAnd("ProductContent", UtilMisc.toMap("productId", productId, "contentId", contentIdReplace, "productContentTypeId", "IMAGE"));
+            GenericValue productContent = EntityUtil.getFirst(productContentList);
+
+            if (productContent != null) {
+                Map<String, Object> productContentCtx = FastMap.newInstance();
+                productContentCtx.put("productId", productId);
+                productContentCtx.put("contentId", contentIdReplace);
+                productContentCtx.put("productContentTypeId", "IMAGE");
+                productContentCtx.put("fromDate", productContent.get("fromDate"));
+                productContentCtx.put("userLogin", userLogin);
+                dispatcher.runSync("removeProductContentAndImageFile", productContentCtx);
+            }
+        } catch (WatermarkerException e) {
+            String errMsg = "Cannot replace image.";
+            request.setAttribute("_ERROR_MESSAGE_", errMsg);
+            Debug.logError(e, errMsg, module);
+            return "error";
+        }
+        String eventMsg = "Replace image successfully.";
+        request.setAttribute("_EVENT_MESSAGE_", eventMsg);
+        return "success";
+    }
+
+}

Added: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java?rev=1052521&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java (added)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java Fri Dec 24 15:22:49 2010
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * 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 org.ofbiz.product.imagemanagement;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
+import javax.imageio.ImageIO;
+
+import javolution.util.FastMap;
+
+import org.jdom.JDOMException;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.base.util.string.FlexibleStringExpander;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceUtil;
+
+
+public class RotateImage {
+
+    public static final String module = RotateImage.class.getName();
+    public static final String resource = "ProductErrorUiLabels";
+
+    public static Map<String, Object> imageRotate(DispatchContext dctx, Map<String, ? extends Object> context)
+    throws IOException, JDOMException {
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        GenericValue userLogin = (GenericValue) context.get("userLogin");
+        
+        String productId = (String) context.get("productId");
+        String imageName = (String) context.get("imageName");
+        String angle = (String) context.get("angle");
+
+        
+        if (UtilValidate.isNotEmpty(imageName)) {
+            Map<String, Object> contentCtx = FastMap.newInstance();
+            contentCtx.put("contentTypeId", "DOCUMENT");
+            contentCtx.put("userLogin", userLogin);
+            Map<String, Object> contentResult = FastMap.newInstance();
+            try {
+                contentResult = dispatcher.runSync("createContent", contentCtx);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+            
+            Map<String, Object> contentThumb = FastMap.newInstance();
+            contentThumb.put("contentTypeId", "DOCUMENT");
+            contentThumb.put("userLogin", userLogin);
+            Map<String, Object> contentThumbResult = FastMap.newInstance();
+            try {
+                contentThumbResult = dispatcher.runSync("createContent", contentThumb);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+            
+            String contentIdThumb = (String) contentThumbResult.get("contentId");
+            String contentId = (String) contentResult.get("contentId");
+            String filenameToUse = (String) contentResult.get("contentId") + ".jpg";
+            String filenameTouseThumb = (String) contentThumbResult.get("contentId") + ".jpg";
+            
+            String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+            BufferedImage bufImg = ImageIO.read(new File(imageServerPath + "/products/management/" + productId + "/" + imageName));
+            
+            int bufImgType;
+            if (BufferedImage.TYPE_CUSTOM == bufImg.getType()) {
+                bufImgType = BufferedImage.TYPE_INT_ARGB_PRE;
+            } else {
+                bufImgType = bufImg.getType();
+            }
+            
+            int w = bufImg.getWidth(null);
+            int h = bufImg.getHeight(null);
+            BufferedImage bufNewImg = new BufferedImage(w, h, bufImgType);
+            Graphics2D g = bufNewImg.createGraphics();
+            g.rotate(Math.toRadians(Double.parseDouble(angle)), w/2, h/2);
+            g.drawImage(bufImg,0,0,null);
+            g.dispose();
+            
+            String mimeType = imageName.substring(imageName.lastIndexOf(".") + 1);
+            ImageIO.write((RenderedImage) bufNewImg, mimeType, new File(imageServerPath + "/products/management/" + productId + "/" + filenameToUse));
+            
+            double imgHeight = bufNewImg.getHeight();
+            double imgWidth = bufNewImg.getWidth();
+            
+            Map<String, Object> resultResize = ImageManagementServices.resizeImageThumbnail(bufNewImg, imgHeight, imgWidth);
+            ImageIO.write((RenderedImage) resultResize.get("bufferedImage"), mimeType, new File(imageServerPath + "/products/management/" + productId + "/" + filenameTouseThumb));
+            
+            String imageUrlResource = "/images/products/management/" + productId + "/" + filenameToUse;
+            String imageUrlThumb = "/images/products/management/" + productId + "/" + filenameTouseThumb;
+            
+            ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameToUse, imageUrlResource, contentId);
+            ImageManagementServices.createContentAndDataResource(dctx, userLogin, filenameTouseThumb, imageUrlThumb, contentIdThumb);
+            
+            Map<String, Object> createContentAssocMap = FastMap.newInstance();
+            createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL");
+            createContentAssocMap.put("contentId", contentId);
+            createContentAssocMap.put("contentIdTo", contentIdThumb);
+            createContentAssocMap.put("userLogin", userLogin);
+            try {
+                dispatcher.runSync("createContentAssoc", createContentAssocMap);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+            
+            Map<String, Object> productContentCtx = FastMap.newInstance();
+            productContentCtx.put("productId", productId);
+            productContentCtx.put("productContentTypeId", "IMAGE");
+            productContentCtx.put("fromDate", UtilDateTime.nowTimestamp());
+            productContentCtx.put("userLogin", userLogin);
+            productContentCtx.put("contentId", contentId);
+            productContentCtx.put("statusId", "IM_PENDING");
+            try {
+                dispatcher.runSync("createProductContent", productContentCtx);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+            
+            Map<String, Object> partyContentCtx = FastMap.newInstance();
+            partyContentCtx.put("contentId", contentId);
+            partyContentCtx.put("userLogin", userLogin);
+            try {
+                dispatcher.runSync("createImagePartyContent", partyContentCtx);
+            } catch (GenericServiceException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+        } else {
+            String errMsg = "Please select Image.";
+            Debug.logFatal(errMsg, module);
+            return ServiceUtil.returnError(errMsg);
+        }
+        String successMsg = "Rotated image successfully.";
+        Map<String, Object> result = ServiceUtil.returnSuccess(successMsg);
+        return result;
+    }
+}

Added: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java?rev=1052521&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java (added)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java Fri Dec 24 15:22:49 2010
@@ -0,0 +1,404 @@
+/*******************************************************************************
+ * 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 org.ofbiz.product.imagemanagement;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.text.DecimalFormat;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import javolution.util.FastMap;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.base.util.string.FlexibleStringExpander;
+import org.ofbiz.entity.Delegator;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceUtil;
+
+import watermarker.exception.WatermarkerException;
+import watermarker.impl.DefaultWatermarker;
+import watermarker.model.WatermarkSettings;
+import watermarker.model.WatermarkerSettings;
+public class WatermarkImage{
+    
+    public static final String module = WatermarkImage.class.getName();
+    public static final String resource = "ProductErrorUiLabels";
+    
+    public static String createWatermarkImage(HttpServletRequest request, HttpServletResponse response) throws WatermarkerException, IOException {
+        Map<String, ? extends Object> context = request.getParameterMap();
+        String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+        LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+        Delegator delegator = (Delegator) request.getAttribute("delegator");
+        GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
+        String watermarkText = null;
+        URL imageUrl = null;
+        String productId = request.getParameter("productId");
+        String imageName = request.getParameter("imageName");
+        String text = request.getParameter("textWatermark");
+        String opacity = request.getParameter("opacity");
+        String x = request.getParameter("pointX");
+        String y = request.getParameter("pointY");
+        String width = request.getParameter("width");
+        String count = request.getParameter("count");
+        String fontColor = request.getParameter("colorWatermark");
+        String fontSize = request.getParameter("sizeWatermark");
+        
+        File file = new File(imageServerPath + "/products/management/previewImage" + count  + ".jpg");
+        file.delete();
+        try {
+            if (UtilValidate.isNotEmpty(imageName)) {
+                imageUrl = new URL("file:" + imageServerPath + "/products/management/" + productId + "/" + imageName);
+            } else {
+                String errMsg = "Please select Image.";
+                request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                return "error";
+            }
+
+            if (UtilValidate.isNotEmpty(text)) {
+                watermarkText = text;
+            } else {
+                String errMsg = "Please enter Text.";
+                request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                return "error";
+            }
+
+            WatermarkerSettings watermarkerSettings = WatermarkerSettings.DEFAULT;
+
+            if (UtilValidate.isNotEmpty(fontColor)) {
+                Color graphicsColor = setFontColor(fontColor);
+                watermarkerSettings.setGraphicsColor(graphicsColor);
+            } else {
+                String errMsg = "Please select Text Color.";
+                request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                return "error";
+            }
+
+            DecimalFormat decimalFormat = new DecimalFormat();
+            decimalFormat.applyPattern("0.00");
+            if (UtilValidate.isNotEmpty(fontSize)) {
+                BigDecimal widthBase = new BigDecimal(600.00);
+                BigDecimal picWidth = new BigDecimal(decimalFormat.format(Float.parseFloat(width)));
+                Font graphicsFont = setFontSize(fontSize, picWidth.divide(widthBase, 2));
+                watermarkerSettings.setGraphicsFont(graphicsFont);
+            } else {
+                String errMsg = "Please select Text Size.";
+                request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                return "error";
+            }
+
+            WatermarkSettings position = new WatermarkSettings();
+            if (UtilValidate.isNotEmpty(x) && UtilValidate.isNotEmpty(y)) {
+                BigDecimal positionX = new BigDecimal(decimalFormat.format(Float.parseFloat(x)));
+                BigDecimal positionY = new BigDecimal(decimalFormat.format(Float.parseFloat(y)));
+                position.setX(positionX.floatValue());
+                position.setY(positionY.floatValue());
+                watermarkerSettings.setWatermarkSettings(position);
+            } else {
+                String errMsg = "Please select Text Position.";
+                request.setAttribute("_ERROR_MESSAGE_", errMsg);
+                return "error";
+            }
+
+            AlphaComposite alphaComposite = null;
+            if (UtilValidate.isNotEmpty(opacity)) {
+                BigDecimal opa = new BigDecimal(opacity);
+                alphaComposite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, opa.floatValue());
+                watermarkerSettings.setAlphaComposite(alphaComposite);
+            }
+
+            if (UtilValidate.isNotEmpty(imageUrl)) {
+                
+                Map<String, Object> contentCtx = FastMap.newInstance();
+                contentCtx.put("contentTypeId", "DOCUMENT");
+                contentCtx.put("userLogin", userLogin);
+                Map<String, Object> contentResult = FastMap.newInstance();
+                try {
+                    contentResult = dispatcher.runSync("createContent", contentCtx);
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
+                return "error";
+                }
+
+                Map<String, Object> contentThumb = FastMap.newInstance();
+                contentThumb.put("contentTypeId", "DOCUMENT");
+                contentThumb.put("userLogin", userLogin);
+                Map<String, Object> contentThumbResult = FastMap.newInstance();
+                try {
+                    contentThumbResult = dispatcher.runSync("createContent", contentThumb);
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    return e.getMessage();
+                }
+
+                String contentIdThumb = (String) contentThumbResult.get("contentId");
+                String contentId = (String) contentResult.get("contentId");
+                String filenameToUse = (String) contentResult.get("contentId") + ".jpg";
+                String filenameTouseThumb = (String) contentThumbResult.get("contentId") + ".jpg";
+                File outputImageFile = new File(imageServerPath + "/products/management/" + productId + "/" + filenameToUse);
+                OutputStream outputStream = new FileOutputStream(outputImageFile);
+
+                // *** Actual call to Watermarker#watermark(...) ***
+                new DefaultWatermarker().watermark(imageUrl, watermarkText, outputStream, watermarkerSettings);
+
+                String imageUrlResource = "/images/products/management/" + productId + "/" + filenameToUse;
+
+                BufferedImage bufNewImg = ImageIO.read(new File(imageServerPath + "/products/management/" + productId + "/" + filenameToUse));
+
+                double imgHeight = bufNewImg.getHeight();
+                double imgWidth = bufNewImg.getWidth();
+                String mimeType = imageName.substring(imageName.lastIndexOf(".") + 1);
+
+                Map<String, Object> resultResize = ImageManagementServices.resizeImageThumbnail(bufNewImg, imgHeight, imgWidth);
+                ImageIO.write((RenderedImage) resultResize.get("bufferedImage"), mimeType, new File(imageServerPath + "/products/management/" + productId + "/" + filenameTouseThumb));
+
+                String imageUrlThumb = "/images/products/management/" + productId + "/" + filenameTouseThumb;
+
+                createContentAndDataResourceWaterMark(request, userLogin, filenameToUse, imageUrlResource, contentId);
+                createContentAndDataResourceWaterMark(request, userLogin, filenameTouseThumb, imageUrlThumb, contentIdThumb);
+
+                Map<String, Object> createContentAssocMap = FastMap.newInstance();
+                createContentAssocMap.put("contentAssocTypeId", "IMAGE_THUMBNAIL");
+                createContentAssocMap.put("contentId", contentId);
+                createContentAssocMap.put("contentIdTo", contentIdThumb);
+                createContentAssocMap.put("userLogin", userLogin);
+                try {
+                    dispatcher.runSync("createContentAssoc", createContentAssocMap);
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    return e.getMessage();
+                }
+
+                Map<String, Object> productContentCtx = FastMap.newInstance();
+                productContentCtx.put("productId", productId);
+                productContentCtx.put("productContentTypeId", "IMAGE");
+                productContentCtx.put("fromDate", UtilDateTime.nowTimestamp());
+                productContentCtx.put("userLogin", userLogin);
+                productContentCtx.put("contentId", contentId);
+                productContentCtx.put("statusId", "IM_PENDING");
+                try {
+                    dispatcher.runSync("createProductContent", productContentCtx);
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    request.setAttribute("_ERROR_MESSAGE_", e.getMessage());return "error";
+                }
+                
+                Map<String, Object> partyContentCtx = FastMap.newInstance();
+                partyContentCtx.put("contentId", contentId);
+                partyContentCtx.put("userLogin", userLogin);
+                try {
+                    dispatcher.runSync("createImagePartyContent", partyContentCtx);
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    request.setAttribute("_ERROR_MESSAGE_", e.getMessage());return "error";
+                }
+            }
+        } catch (WatermarkerException e) {
+            String errMsg = "Cannot create watermark.";
+            request.setAttribute("_ERROR_MESSAGE_", errMsg);
+            Debug.logError(e, errMsg, module);
+            return "error";
+        }
+        String eventMsg = "Watermark image successfully.";
+        request.setAttribute("_EVENT_MESSAGE_", eventMsg);
+        return "success";
+    }
+
+    public static Map<String, Object> createContentAndDataResourceWaterMark(HttpServletRequest request, GenericValue userLogin, String filenameToUse, String imageUrl, String contentId){
+        Map<String, Object> result = FastMap.newInstance();
+        LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
+        Delegator delegator = (Delegator) request.getAttribute("delegator");
+
+        Map<String, Object> dataResourceCtx = FastMap.newInstance();
+
+        dataResourceCtx.put("objectInfo", imageUrl);
+        dataResourceCtx.put("dataResourceName", filenameToUse);
+        dataResourceCtx.put("userLogin", userLogin);
+        dataResourceCtx.put("dataResourceTypeId", "SHORT_TEXT");
+        dataResourceCtx.put("mimeTypeId", "text/html");
+        dataResourceCtx.put("isPublic", "Y");
+
+        Map<String, Object> dataResourceResult = FastMap.newInstance();
+        try {
+            dataResourceResult = dispatcher.runSync("createDataResource", dataResourceCtx);
+        } catch (GenericServiceException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+
+        Map<String, Object> contentUp = FastMap.newInstance();
+        contentUp.put("contentId", contentId);
+        contentUp.put("dataResourceId", dataResourceResult.get("dataResourceId"));
+        contentUp.put("contentName", filenameToUse);
+        contentUp.put("userLogin", userLogin);
+        try {
+            dispatcher.runSync("updateContent", contentUp);
+        } catch (GenericServiceException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+
+        GenericValue content = null;
+        try {
+            content = delegator.findOne("Content", UtilMisc.toMap("contentId", contentId), false);
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+            return ServiceUtil.returnError(e.getMessage());
+        }
+
+        if (content != null) {
+            GenericValue dataResource = null;
+            try {
+                dataResource = content.getRelatedOne("DataResource");
+            } catch (GenericEntityException e) {
+                Debug.logError(e, module);
+                return ServiceUtil.returnError(e.getMessage());
+            }
+
+            if (dataResource != null) {
+                dataResourceCtx.put("dataResourceId", dataResource.getString("dataResourceId"));
+                try {
+                    dispatcher.runSync("updateDataResource", dataResourceCtx);
+                } catch (GenericServiceException e) {
+                    Debug.logError(e, module);
+                    return ServiceUtil.returnError(e.getMessage());
+                }
+            }
+        }
+        return result;
+    }
+    public static String setPreviewWaterMark(HttpServletRequest request, HttpServletResponse response) {
+        Map<String, ? extends Object> context = request.getParameterMap();
+        String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+        String productId = request.getParameter("productId");
+        String imageName = request.getParameter("imageName");
+        String text = request.getParameter("text");
+        String opacity = request.getParameter("opacity");
+        String x = request.getParameter("x");
+        String y = request.getParameter("y");
+        String width = request.getParameter("width");
+        String count = request.getParameter("count");
+        String fontColor = request.getParameter("fontColor");
+        String fontSize = request.getParameter("fontSize");
+        
+        BigDecimal opa = new BigDecimal(opacity);
+        DecimalFormat decimalFormat = new DecimalFormat();
+        decimalFormat.applyPattern("0.00");
+        BigDecimal positionX = new BigDecimal(decimalFormat.format(Float.parseFloat(x)));
+        BigDecimal positionY = new BigDecimal(decimalFormat.format(Float.parseFloat(y)));
+        BigDecimal picWidth = new BigDecimal(decimalFormat.format(Float.parseFloat(width)));
+        File file = new File(imageServerPath + "/products/management/previewImage" + count  + ".jpg");
+        file.delete();
+        BigDecimal widthBase = new BigDecimal(600.00);
+        Integer currentPic = Integer.parseInt(count);
+        int nextPic = currentPic.intValue() + 1;
+        AlphaComposite alphaComposite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, opa.floatValue());
+        WatermarkSettings position = new WatermarkSettings();
+        position.setX(positionX.floatValue());
+        position.setY(positionY.floatValue());
+        Color graphicsColor = setFontColor(fontColor);
+        Font graphicsFont = setFontSize(fontSize, picWidth.divide(widthBase, 2));
+        WatermarkerSettings watermarkerSettings = WatermarkerSettings.DEFAULT;
+        watermarkerSettings.setGraphicsColor(graphicsColor);
+        watermarkerSettings.setGraphicsFont(graphicsFont);
+        watermarkerSettings.setWatermarkSettings(position);
+        watermarkerSettings.setAlphaComposite(alphaComposite);
+        try {
+           URL imageUrl = new URL("file:" + imageServerPath + "/products/management/" + productId + "/" + imageName);
+           File outputImageFile = new File(imageServerPath + "/products/management/previewImage" + nextPic + ".jpg");
+           OutputStream outputStream = new FileOutputStream(outputImageFile);
+
+           new DefaultWatermarker().watermark(imageUrl, text, outputStream, watermarkerSettings);
+
+        } catch (Exception e) {
+            String errMsg = "Error from setPreviewWaterMark";
+            request.setAttribute("_ERROR_MESSAGE_", errMsg);
+            return "error";
+        }
+        return "success";
+    }
+    public static String deletePreviewWatermarkImage(HttpServletRequest request, HttpServletResponse response) {
+        Map<String, ? extends Object> context = request.getParameterMap();
+        String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
+        String count = request.getParameter("count");
+        File file = new File(imageServerPath + "/products/management/previewImage" + count  + ".jpg");
+        file.delete();
+
+     return "success";
+    }
+
+    private static Color setFontColor(String color) {
+        Color graphicsColor = null;
+        if (color.equals("TEXT_BLACK")) {
+            graphicsColor = Color.BLACK;
+        } else if (color.equals("TEXT_WHITE")) {
+            graphicsColor = Color.WHITE;
+        } else if (color.equals("TEXT_GRAY")) {
+            graphicsColor = Color.GRAY;
+        } else if(color.equals("TEXT_RED")) {
+            graphicsColor = Color.RED;
+        } else if(color.equals("TEXT_GREEN")) {
+            graphicsColor = Color.GREEN;
+        } else if(color.equals("TEXT_BLUE")) {
+            graphicsColor = Color.BLUE;
+        } else if(color.equals("TEXT_YELLOW")) {
+            graphicsColor = Color.YELLOW;
+        }
+        return graphicsColor;
+    }
+
+    private static Font setFontSize(String fontSize, BigDecimal multiply) {
+        Font graphicsFont = null;
+        BigDecimal baseSize = null;
+        if (fontSize.equals("TEXT_SMALL")) {
+            baseSize = new BigDecimal(24.00);
+            graphicsFont = new Font( "Arial", Font.BOLD, baseSize.multiply(multiply).intValue());
+        } else if (fontSize.equals("TEXT_MIDDLE")) {
+            baseSize = new BigDecimal(36.00);
+            graphicsFont = new Font( "Arial", Font.BOLD, baseSize.multiply(multiply).intValue());
+        } else if (fontSize.equals("TEXT_LARGE")) {
+            baseSize = new BigDecimal(48.00);
+            graphicsFont = new Font( "Arial", Font.BOLD, baseSize.multiply(multiply).intValue());
+        } else if (fontSize.equals("TEXT_VERYLARGE")) {
+            baseSize = new BigDecimal(60.00);
+            graphicsFont = new Font( "Arial", Font.BOLD, baseSize.multiply(multiply).intValue());
+        }
+        return graphicsFont;
+    }
+}

Added: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageFrame.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageFrame.groovy?rev=1052521&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageFrame.groovy (added)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageFrame.groovy Fri Dec 24 15:22:49 2010
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+import javax.servlet.http.HttpSession;
+
+frameContentId = parameters.get("frameContentId");
+frameDataResourceId = parameters.get("frameDataResourceId");
+if ((session != null) && (frameContentId == null) && (frameDataResourceId == null)) {
+    frameContentId = session.getAttribute("frameContentId");
+    frameDataResourceId = session.getAttribute("frameDataResourceId");
+}
+
+context.frameContentId = frameContentId;
+context.frameDataResourceId = frameDataResourceId;
+
+session.removeAttribute("frameContentId");
+session.removeAttribute("frameDataResourceId");