Author: jacopoc
Date: Thu Jul 7 17:35:47 2016
New Revision: 1751819
URL: http://svn.apache.org/viewvc?rev=1751819&view=rev
Log:
Removed the watermarker jar and the code that was dependent on it because
Watermarker is a dead project and the jar is no more publicly available, so we
will not be able to run it in releases.
Removed:
ofbiz/trunk/applications/product/lib/watermarker-0.0.4.jar
ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java
ofbiz/trunk/applications/product/template/imagemanagement/ImageWatermark.ftl
Modified:
ofbiz/trunk/LICENSE
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
Modified: ofbiz/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1751819&r1=1751818&r2=1751819&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Thu Jul 7 17:35:47 2016
@@ -119,7 +119,6 @@ framework/webapp/lib/serializer-2.7.0.ja
framework/webapp/lib/xalan-2.7.1.jar
applications/content/lib/poi-3.13-20150929.jar
applications/product/lib/dozer-4.2.1.jar
-applications/product/lib/watermarker-0.0.4.jar
tools/security/notsoserial/notsoserial-1.0-SNAPSHOT.jar
specialpurpose/passport/lib/commons-httpclient-3.1.jar
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1751819&r1=1751818&r2=1751819&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Thu Jul 7
17:35:47 2016
@@ -8624,15 +8624,6 @@
<value xml:lang="zh">å¾çä¸ä¼ å表</value>
<value xml:lang="zh-TW">åçä¸å³æ¸
å®</value>
</property>
- <property key="ImageManagementImageWatermarking">
- <value xml:lang="de">Bild Wasserzeichen</value>
- <value xml:lang="en">Image Watermarking</value>
- <value xml:lang="ja">ç»åéãã</value>
- <value xml:lang="th">ลายà¸à¹à¸³à¸£à¸¹à¸à¸ าà¸</value>
- <value xml:lang="vi">Lá»c mỠảnh</value>
- <value xml:lang="zh">å¾çæ°´å°</value>
- <value xml:lang="zh-TW">åç浮水å°</value>
- </property>
<property key="ImageManagementImageWidth">
<value xml:lang="de">Bildbreite</value>
<value xml:lang="en">Image Width</value>
@@ -8801,24 +8792,6 @@
<value xml:lang="zh">ä¸ä¼ æ°çæ¡</value>
<value xml:lang="zh-TW">ä¸å³æ°çæ¡</value>
</property>
- <property key="ImageManagementWatermark">
- <value xml:lang="de">Wasserzeichen</value>
- <value xml:lang="en">Watermark</value>
- <value xml:lang="ja">éãã</value>
- <value xml:lang="th">ลายà¸à¹à¸³</value>
- <value xml:lang="vi">LÃ m má»</value>
- <value xml:lang="zh">æ°´å°</value>
- <value xml:lang="zh-TW">浮水å°</value>
- </property>
- <property key="ImageManagementWatermarkingLocation">
- <value xml:lang="de">Direkt auf das Bild klicken um die Position des
Wasserzeichens anzupassen</value>
- <value xml:lang="en">Click directly on the image to adjust the
location of the watermark</value>
- <value xml:lang="fr">Cliquer directement sur l'image pour positionner
le filigrane</value>
- <value
xml:lang="ja">éããã®ä½ç½®ã調æ´ããã«ã¯ç»åãç´æ¥ã¯ãªãã¯ãã¦ãã
ãã</value>
- <value xml:lang="vi">Bấm trá»±c tiếp lên ảnh Äá» Äiá»u
chá»nh vá» trà là m má»</value>
- <value
xml:lang="zh">ç´æ¥ç¹å»å¨å¾çä¸æ¥è°æ´æ°´å°ä½ç½®</value>
- <value
xml:lang="zh-TW">ç´æ¥é»æå¨åçä¸ä¾èª¿æ´æµ®æ°´å°ä½ç½®</value>
- </property>
<property key="ImageManagementWelcomeMessage">
<value xml:lang="de">Willkommen in der Bildbearbeitung</value>
<value xml:lang="en">Welcome to the Image Management</value>
Modified:
ofbiz/trunk/applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml?rev=1751819&r1=1751818&r2=1751819&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml
(original)
+++ ofbiz/trunk/applications/product/data/helpdata/HELP_IMAGEMANAGEMENT.xml Thu
Jul 7 17:35:47 2016
@@ -123,11 +123,11 @@
<section>
<title>Manage</title>
<section>
- <para>You can edit image such as add frame, embedded watermark,
crop image etc. You can also add caption, sort order, enable image and choose
thumbnail in this function.</para>
+ <para>You can edit image such as add frame, crop image etc. You
can also add caption, sort order, enable image and choose thumbnail in this
function.</para>
<para>Note: You must have Image Management Admin permission for
access this function.</para>
<orderedlist>
<listitem>
- <para>Click 'Manage' Button, then you can choose action
including 'Frame', 'Watermark', 'Crop' and 'Rotate' (see below for more
details).</para>
+ <para>Click 'Manage' Button, then you can choose action
including 'Frame', 'Crop' and 'Rotate' (see below for more details).</para>
<para>Enter your image caption.</para>
<para>Sort order of image by enter order number.</para>
<para>Enable image by tick enable checkbox.</para>
@@ -151,20 +151,6 @@
</listitem>
</orderedlist>
</section>
- </section>
- <section>
- <title>- Watermark</title>
- <section>
- <para>In Watermark function, you can draw some text on
your image.</para>
- <orderedlist>
- <listitem>
- <para>Choose 'Watermark' then choose image you
want.</para>
- <para>Enter any text, Choose text color, text size
and text position.</para>
- <para>Optional, you can preview image by click
'Preview' button.</para>
- <para>Click 'Watermark' button.</para>
- </listitem>
- </orderedlist>
- </section>
</section>
<section>
<title>- Crop</title>
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1751819&r1=1751818&r2=1751819&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Thu
Jul 7 17:35:47 2016
@@ -2712,11 +2712,6 @@ under the License.
<response name="success" type="view" value="ImageFrames"/>
<response name="error" type="view" value="ImageFrames"/>
</request-map>
- <request-map uri="ImageWatermarking">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ImageWatermarking"/>
- <response name="error" type="view" value="ImageWatermarking"/>
- </request-map>
<request-map uri="ImageCropping">
<security https="true" auth="true"/>
<response name="success" type="view" value="ImageCropping"/>
@@ -2799,18 +2794,6 @@ under the License.
<response name="success" type="view" value="ListImageManage"/>
<response name="error" type="view" value="ListImageManage"/>
</request-map>
- <request-map uri="createWatermarkImage">
- <security https="true" auth="true"/>
- <event type="java"
path="org.ofbiz.product.imagemanagement.WatermarkImage"
invoke="createWatermarkImage"/>
- <response name="success" type="view" value="ListImageManage"/>
- <response name="error" type="view" value="ImageWatermarking"/>
- </request-map>
- <request-map uri="previewWatermarkImage">
- <security https="true" auth="true"/>
- <event type="java"
path="org.ofbiz.product.imagemanagement.WatermarkImage"
invoke="previewWatermarkImage"/>
- <response name="success" type="view" value="viewPreviewImage"/>
- <response name="error" type="view" value="viewPreviewImage"/>
- </request-map>
<request-map uri="previewFrameImage">
<security https="true" auth="true"/>
<event type="java" path="org.ofbiz.product.imagemanagement.FrameImage"
invoke="previewFrameImage"/>
@@ -2873,7 +2856,6 @@ under the License.
<security https="true" auth="true"/>
<event type="groovy"
path="component://product/groovyScripts/catalog/imagemanagement/CheckAction.groovy"/>
<response name="frame" type="request" value="ImageFrames"/>
- <response name="watermark" type="request" value="ImageWatermarking"/>
<response name="crop" type="request" value="ImageCropping"/>
<response name="rotate" type="request" value="ImageRotating"/>
<response name="noAction" type="request-redirect"
value="ListImageManage"/>
@@ -2909,12 +2891,6 @@ under the License.
<response name="success" type="view" value="ListPeopleRejected"/>
<response name="error" type="view" value="ListPeopleRejected"/>
</request-map>
- <request-map uri="setPreviewWaterMark">
- <security https="true" auth="true"/>
- <event type="java"
path="org.ofbiz.product.imagemanagement.WatermarkImage"
invoke="setPreviewWaterMark"/>
- <response name="success" type="view" value="viewPreviewImage"/>
- <response name="error" type="view" value="viewPreviewImage"/>
- </request-map>
<request-map uri="chooseFrameImage">
<security https="true" auth="true"/>
<event type="java" path="org.ofbiz.product.imagemanagement.FrameImage"
invoke="chooseFrameImage"/>
@@ -2933,12 +2909,6 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupImageFrame"/>
</request-map>
- <request-map uri="deletePreviewWatermarkImage">
- <security https="true" auth="true"/>
- <event type="java"
path="org.ofbiz.product.imagemanagement.WatermarkImage"
invoke="deletePreviewWatermarkImage"/>
- <response name="success" type="view" value="ListImageManage"/>
- <response name="error" type="view" value="ImageWatermarking"/>
- </request-map>
<request-map uri="ImageResize">
<security https="true" auth="true"/>
<response name="success" type="view" value="ImageResize"/>
@@ -3274,7 +3244,6 @@ under the License.
<view-map name="ImageApprove"
page="component://product/widget/catalog/ImageManagementScreens.xml#ImageApprove"
type="screen"/>
<view-map name="ImageRejected"
page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRejected"
type="screen"/>
<view-map name="ImageFrames"
page="component://product/widget/catalog/ImageManagementScreens.xml#ImageFrames"
type="screen"/>
- <view-map name="ImageWatermarking"
page="component://product/widget/catalog/ImageManagementScreens.xml#ImageWatermarking"
type="screen"/>
<view-map name="ImageCropping"
page="component://product/widget/catalog/ImageManagementScreens.xml#ImageCropping"
type="screen"/>
<view-map name="ImageRotating"
page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRotating"
type="screen"/>
<view-map name="ImageShare"
page="component://product/widget/catalog/ImageManagementScreens.xml#ImageShare"
type="screen"/>
Modified:
ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1751819&r1=1751818&r2=1751819&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml
Thu Jul 7 17:35:47 2016
@@ -311,7 +311,6 @@ under the License.
document.ListImageManage.submit();">
<drop-down allow-empty="true">
<option key="frame"
description="${uiLabelMap.ImageManagementFrame}"/>
- <option key="watermark"
description="${uiLabelMap.ImageManagementWatermark}"/>
<option key="crop"
description="${uiLabelMap.ImageManagementCrop}"/>
<option key="rotate"
description="${uiLabelMap.ImageManagementRotate}"/>
</drop-down>
@@ -428,72 +427,7 @@ under the License.
</hyperlink>
</field>
</form>
-
- <form name="ImageWatermarking" type="single" target="createWatermarkImage"
title="" header-row-style="header-row" default-table-style="basic-table">
- <actions>
- <entity-one entity-name="ContentDataResourceView"
value-field="contentDataResource">
- <field-map field-name="contentId"
from-field="parameters.contentId"/>
- <field-map field-name="drDataResourceId"
from-field="parameters.dataResourceId"/>
- </entity-one>
- <set field="imageURL"
from-field="contentDataResource.drObjectInfo"/>
- </actions>
- <field name="imageServerUrl"><hidden/></field>
- <field name="productId"><hidden/></field>
- <field name="contentId"><hidden/></field>
- <field name="dataResourceId"><hidden/></field>
- <field name="pointX"><hidden/></field>
- <field name="pointY"><hidden/></field>
- <field name="width"><hidden/></field>
- <field name="height"><hidden/></field>
- <field name="positionX" widget-area-style="positionX"><hidden
value="50.00"/></field>
- <field name="positionY" widget-area-style="positionY"><hidden
value="50.00"/></field>
- <field name="previewCount" widget-area-style="count"><hidden
value="0"/></field>
- <field name="imageName"><hidden
value="${contentDataResource.drDataResourceName}"/></field>
- <field name="imageWatermark" use-when="imageURL != null"
title="${uiLabelMap.CommonImage}" widget-area-style="img-src"><image
value="${imageURL}"/></field>
- <field name="imageWatermark" use-when="imageURL == null"
title="${uiLabelMap.CommonImage}" widget-area-style="img-src-de"><image
value="/images/defaultImage.jpg"/></field>
- <field name="" widget-style="h3"><display
description="${uiLabelMap.ImageManagementWatermarkingLocation}"/></field>
- <field name="imageOpacity"
title="${uiLabelMap.ImageManagementOpacity}" widget-area-style="opacity">
- <drop-down no-current-selected-key="0.5">
- <option key="0.1" description="10%"/>
- <option key="0.2" description="20%"/>
- <option key="0.3" description="30%"/>
- <option key="0.4" description="40%"/>
- <option key="0.5" description="50%"/>
- <option key="0.6" description="60%"/>
- <option key="0.7" description="70%"/>
- <option key="0.8" description="80%"/>
- <option key="0.9" description="90%"/>
- <option key="1.0" description="100%"/>
- </drop-down>
- </field>
- <field name="textWatermark" title="${uiLabelMap.CommonText}"
widget-area-style="watermark_txt"><text default-value="DEFAULT"/></field>
- <field name="previewButton" title=" " widget-style="buttontext"
widget-area-style="preview"><hyperlink target="#" target-type="plain"
description="${uiLabelMap.CommonPreview}"/></field>
- <field name="colorWatermark"
title="${uiLabelMap.ImageManagementTextColor}" widget-area-style="txt_color">
- <drop-down allow-empty="true" no-current-selected-key="TEXT_BLACK">
- <entity-options entity-name="ProductFeature"
key-field-name="productFeatureId">
- <entity-constraint name="productFeatureTypeId"
value="COLOR"/>
- <entity-constraint name="productFeatureCategoryId"
value="TEXT"/>
- <entity-order-by field-name="defaultSequenceNum"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="sizeWatermark"
title="${uiLabelMap.ImageManagementTextSize}" widget-area-style="txt_size">
- <drop-down allow-empty="true"
no-current-selected-key="TEXT_MIDDLE">
- <entity-options entity-name="ProductFeature"
key-field-name="productFeatureId">
- <entity-constraint name="productFeatureTypeId"
value="SIZE"/>
- <entity-constraint name="productFeatureCategoryId"
value="TEXT"/>
- <entity-order-by field-name="defaultSequenceNum"/>
- </entity-options>
- </drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonSubmit}"
event="onClick" action="javascript:setImageDimension()"
widget-style="smallSubmit" ><submit button-type="button"/></field>
- <field name="cancelButton" title=" " widget-style="buttontext"
event="onClick" action="javascript:deletePreviewWatermarkImage();">
- <hyperlink target="ListImageManage"
description="${uiLabelMap.CommonCancel}">
- <parameter param-name="productId"
from-field="parameters.productId"/>
- </hyperlink>
- </field>
- </form>
-
+
<form name="ImageCropping" type="single" title=""
header-row-style="header-row" default-table-style="basic-table"
target="CropImage">
<actions>
<entity-one entity-name="ContentDataResourceView"
value-field="contentDataResource">
Modified:
ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1751819&r1=1751818&r2=1751819&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementScreens.xml
Thu Jul 7 17:35:47 2016
@@ -511,45 +511,7 @@ under the License.
</widgets>
</section>
</screen>
-
- <screen name="ImageWatermarking">
- <section>
- <actions>
- <set field="userTabButtonImage" value="ImageManage"/>
- <set field="currentFormName" value="ImageWatermarking"/>
- <set field="statusForm" value="IM_PENDING"/>
- <entity-one entity-name="ContentDataResourceView"
value-field="contentDataResource">
- <field-map field-name="contentId"
from-field="parameters.contentId"/>
- <field-map field-name="drDataResourceId"
from-field="parameters.dataResourceId"/>
- </entity-one>
- <set field="imageURL"
from-field="contentDataResource.drObjectInfo"/>
- <property-to-field resource="catalog"
property="image.management.url" field="imageServerUrl"/>
- </actions>
- <widgets>
- <decorator-screen name="ImageManagementDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission
permission="IMAGE_MANAGEMENT_ADMIN"/>
- </condition>
- <widgets>
- <screenlet
title="${uiLabelMap.ImageManagementImageWatermarking}">
- <include-form name="ImageWatermarking"
location="component://product/widget/catalog/ImageManagementForms.xml"/>
- <platform-specific>
- <html><html-template
location="component://product/template/imagemanagement/ImageWatermark.ftl"/></html>
- </platform-specific>
- </screenlet>
- </widgets>
- <fail-widgets>
- <label text="You do not have permission to
access this page. ("IMAGE_MANAGEMENT_ADMIN" needed)"/>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
+
<screen name="ImageCropping">
<section>
<actions>
