ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sascharodek...@apache.org
Subject svn commit: r1215058 - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/testdef/ applications/commonext/script/org/ofbiz/ applications/commonext/servicedef/ applications/commonext/widget/ applications/order/src/org/ofbiz/order/shopping...
Date Fri, 16 Dec 2011 08:27:26 GMT
Author: sascharodekamp
Date: Fri Dec 16 08:27:25 2011
New Revision: 1215058

URL: http://svn.apache.org/viewvc?rev=1215058&view=rev
Log:
Update the Jackrabbit branch with the current trunk version to keep the branch up to date

Added:
    ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
      - copied unchanged from r1215057, ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
Modified:
    ofbiz/branches/jackrabbit20100709/   (props changed)
    ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/accountingtests.xml
    ofbiz/branches/jackrabbit20100709/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
    ofbiz/branches/jackrabbit20100709/applications/commonext/servicedef/services.xml
    ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml
    ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
    ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml
    ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
    ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
    ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
    ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml
    ofbiz/branches/jackrabbit20100709/rc.ofbiz.for.ubuntu
    ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/servicedef/services_hhfacility.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java

Propchange: ofbiz/branches/jackrabbit20100709/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 16 08:27:25 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:962442-1213212
+/ofbiz/trunk:962442-1215057

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/accountingtests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/accountingtests.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/accountingtests.xml
(original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/accountingtests.xml
Fri Dec 16 08:27:25 2011
@@ -29,7 +29,8 @@
 
     <test-case case-name="accounting-tests"><junit-test-suite class-name="org.ofbiz.accounting.test.FinAccountTests"/></test-case>
 
-    <test-case case-name="auto-accounting-transaction-tests">
+    <!-- commented out for now...test data seems to be missing and i wondered if theyu
ever worked, went back to rev: 903431 and ever there the same problem -->
+    <!-- test-case case-name="auto-accounting-transaction-tests">
         <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml"/>
-    </test-case>
+    </test-case-->
 </test-suite>

Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/script/org/ofbiz/SystemInfoServices.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
(original)
+++ ofbiz/branches/jackrabbit20100709/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
Fri Dec 16 08:27:25 2011
@@ -81,27 +81,78 @@ under the License.
             <entity-one entity-name="WorkEffort" value-field="workEffort">
                 <field-map field-name="workEffortId" from-field="parameters.entityNameId"/>
             </entity-one>
-            <if-compare field="workEffort.workEffortTypeId" value="TASK" operator="equals">
-                <call-simple-method method-name="getPortletAttributeMap"/>
-                <if-compare field="haveUserLogin" value="true" operator="equals">
-                    <if-compare field="attributeMap.taskAssignment" value="Y" operator="not-equals">
-                        <entity-and entity-name="WorkEffortPartyAssignment" list="assigns"
filter-by-date="true">
-                            <field-map field-name="workEffortId" from-field="parameters.entityNameId"/>
-                            <order-by field-name="-fromDate"/>
-                        </entity-and>
-                        <first-from-list entry="assign" list="assigns"/>
-                        <make-value value-field="noteData" entity-name="NoteData"/>
-                        <now-timestamp field="noteData.noteDateTime"/>
-                        <sequenced-id sequence-name="NoteData" field="noteData.noteId"/>
-                        <set field="noteData.noteParty" from-field="assign.partyId"/>
-                        <set field="noteData.noteName" value="SYSTEMNOTE"/>
-                        <set field="noteData.noteInfo" value="New task assignment '${workEffort.workEffortName}'
[${workEffort.workEffortId}]"/>
-                        <set field="noteData.moreInfoPortletId" value="ViewProjectTask"/>
-                        <set field="noteData.moreInfoItemId" from-field="workEffort.workEffortId"/>
-                        <create-value value-field="noteData"/>
+            <if>
+                <condition>
+                    <or>
+                        <if-compare field="workEffort.workEffortTypeId" value="TASK" operator="equals"/>
+                        <if-compare field="workEffort.workEffortTypeId" value="SCRUM_TASK_IMPL"
operator="equals"/>
+                        <if-compare field="workEffort.workEffortTypeId" value="SCRUM_TASK_INST"
operator="equals"/>
+                        <if-compare field="workEffort.workEffortTypeId" value="SCRUM_TASK_ERROR"
operator="equals"/>
+                        <if-compare field="workEffort.workEffortTypeId" value="SCRUM_TASK_TEST"
operator="equals"/>
+                    </or>
+                </condition>
+                <then>
+                    <call-simple-method method-name="getPortletAttributeMap"/>
+                    <if-compare field="haveUserLogin" value="true" operator="equals">
+                        <if-compare field="attributeMap.taskAssignment" value="Y" operator="not-equals">
+                            <entity-and entity-name="WorkEffortPartyAssignment" list="assigns"
filter-by-date="true">
+                                <field-map field-name="workEffortId" from-field="parameters.entityNameId"/>
+                                <order-by field-name="-fromDate"/>
+                            </entity-and>
+                            <first-from-list entry="assign" list="assigns"/>
+                            <make-value value-field="noteData" entity-name="NoteData"/>
+                            <now-timestamp field="noteData.noteDateTime"/>
+                            <sequenced-id sequence-name="NoteData" field="noteData.noteId"/>
+                            <set field="noteData.noteParty" from-field="assign.partyId"/>
+                            <set field="noteData.noteName" value="SYSTEMNOTE"/>
+                            <set field="noteData.noteInfo" value="New task assignment
'${workEffort.workEffortName}' [${workEffort.workEffortId}]"/>
+                            <set field="noteData.moreInfoPortletId" value="ViewProjectTask"/>
+                            <set field="noteData.moreInfoItemId" from-field="workEffort.workEffortId"/>
+                            <create-value value-field="noteData"/>
+                        </if-compare>
                     </if-compare>
-                </if-compare>
-            </if-compare>
+                </then>
+            </if>
+            
+            <!-- create system info note for TASK COMPLETED -->
+            <entity-condition list="completeTask" entity-name="WorkEffortPartyAssignment"
filter-by-date="true">
+                <condition-list combine="and">
+                    <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.entityNameId"/>
+                    <condition-expr field-name="partyId" operator="equals" from-field="userLogin.partyId"/>
+                </condition-list>
+            </entity-condition>
+            <first-from-list entry="completeMessage" list="completeTask"/>
+            <if>
+                <condition>
+                    <or>
+                        <if-compare field="completeMessage.statusId" value="PAS_COMPLETED"
operator="equals"/>
+                        <if-compare field="completeMessage.statusId" value="SCAS_COMPLETED"
operator="equals"/>
+                        <if-compare field="completeMessage.statusId" value="PRTYASGN_UNASSIGNED"
operator="equals"/>
+                    </or>
+                </condition>
+                <then>
+                    <call-simple-method method-name="getPortletAttributeMap"/>
+                    <if-compare field="haveUserLogin" value="true" operator="equals">
+                        <if-compare field="attributeMap.taskAssignment" value="Y" operator="not-equals">
+                            <entity-and entity-name="WorkEffortPartyAssignment" list="assigns"
filter-by-date="true">
+                                <field-map field-name="workEffortId" from-field="parameters.entityNameId"/>
+                                <order-by field-name="-fromDate"/>
+                            </entity-and>
+                            <iterate entry="assign" list="assigns">
+                                <make-value value-field="noteData" entity-name="NoteData"/>
+                                <now-timestamp field="noteData.noteDateTime"/>
+                                <sequenced-id sequence-name="NoteData" field="noteData.noteId"/>
+                                <set field="noteData.noteParty" from-field="assign.partyId"/>
+                                <set field="noteData.noteName" value="SYSTEMNOTE"/>
+                                <set field="noteData.noteInfo" value="Task assignment
completed '${workEffort.workEffortName}' [${workEffort.workEffortId}]"/>
+                                <set field="noteData.moreInfoPortletId" value="ViewProjectTask"/>
+                                <set field="noteData.moreInfoItemId" from-field="workEffort.workEffortId"/>
+                                <create-value value-field="noteData"/>
+                            </iterate>
+                        </if-compare>
+                    </if-compare>
+                </then>
+            </if>
         </if-compare>
         
         <!-- Create a system info note to all customer request participants if a note
was added to the customer request
@@ -271,15 +322,53 @@ under the License.
         <if-not-empty field="systemInfoNotes">
             <set field="lastSystemInfoNote1" from-field="systemInfoNotes[0]"/>
             <field-to-result field="lastSystemInfoNote1"/>
+            <!-- get link from systemInfoNote 1 -->
+            <set field="systemNotepartyId" from-field="systemInfoNotes[0].noteParty"/>
+            <set field="systemNoteworkEffortId" from-field="systemInfoNotes[0].moreInfoItemId"/>
+            <call-simple-method method-name="getLinkFromLastSystemNote"/>
+            <set field="lastSystemInfoLink1" from-field="lastSystemInfoLink"/>
+            <field-to-result field="lastSystemInfoLink1"/>
             <if-not-empty field="systemInfoNotes[2]">
                 <set field="lastSystemInfoNote2" from-field="systemInfoNotes[1]"/>
                 <field-to-result field="lastSystemInfoNote2"/>
+                <!-- get link from systemInfoNote 2 -->
+                <set field="systemNotepartyId" from-field="systemInfoNotes[1].noteParty"/>
+                <set field="systemNoteworkEffortId" from-field="systemInfoNotes[1].moreInfoItemId"/>
+                <call-simple-method method-name="getLinkFromLastSystemNote"/>
+                <set field="lastSystemInfoLink2" from-field="lastSystemInfoLink"/>
+                <field-to-result field="lastSystemInfoLink2"/>
             </if-not-empty>
             <if-not-empty field="systemInfoNotes[3]">
                 <set field="lastSystemInfoNote3" from-field="systemInfoNotes[2]"/>
                 <field-to-result field="lastSystemInfoNote3"/>
+                <!-- get link from systemInfoNote 3 -->
+                <set field="systemNotepartyId" from-field="systemInfoNotes[2].noteParty"/>
+                <set field="systemNoteworkEffortId" from-field="systemInfoNotes[2].moreInfoItemId"/>
+                <call-simple-method method-name="getLinkFromLastSystemNote"/>
+                <set field="lastSystemInfoLink3" from-field="lastSystemInfoLink"/>
+                <field-to-result field="lastSystemInfoLink3"/>
             </if-not-empty>
         </if-not-empty>
     </simple-method>
+    
+    <simple-method method-name="getLinkFromLastSystemNote" short-description="Get links
from the last 3 system info notes">
+        <entity-condition list="linkSystem" entity-name="WorkEffortPartyAssignment" filter-by-date="true">
+            <condition-list combine="and">
+                <condition-expr field-name="partyId" operator="equals" from-field="systemNotepartyId"/>
+                <condition-expr field-name="workEffortId" operator="equals" from-field="systemNoteworkEffortId"/>

+            </condition-list>
+        </entity-condition>
+        <if-not-empty field="linkSystem">
+            <if-compare field="linkSystem[0].statusId" operator="contains" value="PRTYASGN_">
+                <set field="lastSystemInfoLink" value="/taskmgr/control/taskView?taskId=${systemNoteworkEffortId}"/>
+            </if-compare>
+            <if-compare field="linkSystem[0].statusId" operator="contains" value="SCAS_">
+                <set field="lastSystemInfoLink" value="/scrum/control/taskView?taskId=${systemNoteworkEffortId}"/>
+            </if-compare>
+            <if-compare field="linkSystem[0].statusId" operator="contains" value="PAS_">
+                <set field="lastSystemInfoLink" value="/projectmgr/control/taskView?workEffortId=${systemNoteworkEffortId}"/>
+            </if-compare>
+        </if-not-empty>
+    </simple-method>
    
 </simple-methods>

Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/servicedef/services.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/commonext/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/commonext/servicedef/services.xml Fri Dec
16 08:27:25 2011
@@ -47,6 +47,9 @@ under the License.
         <attribute name="lastSystemInfoNote1" type="GenericValue" mode="OUT" optional="true"/>
         <attribute name="lastSystemInfoNote2" type="GenericValue" mode="OUT" optional="true"/>
         <attribute name="lastSystemInfoNote3" type="GenericValue" mode="OUT" optional="true"/>
+        <attribute name="lastSystemInfoLink1" type="String" mode="OUT" optional="true"/>
+        <attribute name="lastSystemInfoLink2" type="String" mode="OUT" optional="true"/>
+        <attribute name="lastSystemInfoLink3" type="String" mode="OUT" optional="true"/>
     </service>
     <service name="getSystemInfoStatus" engine="simple" auth="true"
         location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="getSystemInfoStatus">

Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml Fri
Dec 16 08:27:25 2011
@@ -35,14 +35,13 @@ under the License.
                 <set field="layoutSettings.suppressTab" value="ofbizsetup"/><!--
diseable ofbiz setup by default -->
                 <!-- system info notes -->
                 <service service-name="getLastSystemInfoNote" result-map="resultNote"/>
-                <set field="linkStart" value="/myportal/control/showPortletMainDecorator?portalPortletId="/>
                 <set field="layoutSettings.middleTopHeader" value="---------- ${uiLabelMap.CommonLastSytemNotes}
----------"/>
                 <set field="layoutSettings.middleTopMessage1" value="${groovy:resultNote.lastSystemInfoNote1!=null?resultNote.lastSystemInfoNote1.noteDateTime.toString().substring(0,16)
+ &quot; &quot; + resultNote.lastSystemInfoNote1.noteInfo:&quot;&quot;}"/>
-                <set field="layoutSettings.middleTopLink1" value="${linkStart}${resultNote.lastSystemInfoNote1.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote1.moreInfoItemId}"/>
                 <set field="layoutSettings.middleTopMessage2" value="${groovy:resultNote.lastSystemInfoNote2!=null?resultNote.lastSystemInfoNote2.noteDateTime.toString().substring(0,16)
+ &quot; &quot; + resultNote.lastSystemInfoNote2.noteInfo:&quot;&quot;}"/>
-                <set field="layoutSettings.middleTopLink2" value="${linkStart}${resultNote.lastSystemInfoNote2.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote2.moreInfoItemId}"/>
                 <set field="layoutSettings.middleTopMessage3" value="${groovy:resultNote.lastSystemInfoNote3!=null?resultNote.lastSystemInfoNote3.noteDateTime.toString().substring(0,16)
+ &quot; &quot; + resultNote.lastSystemInfoNote3.noteInfo:&quot;&quot;}"/>
-                <set field="layoutSettings.middleTopLink3" value="${linkStart}${resultNote.lastSystemInfoNote3.moreInfoPortletId}&amp;amp;id=${resultNote.lastSystemInfoNote3.moreInfoItemId}"/>
+                <set field="layoutSettings.middleTopLink1" value="${resultNote.lastSystemInfoLink1}"/>
+                <set field="layoutSettings.middleTopLink2" value="${resultNote.lastSystemInfoLink2}"/>
+                <set field="layoutSettings.middleTopLink3" value="${resultNote.lastSystemInfoLink3}"/>
                 <!-- Help link actions -->
                 <!--<set field="helpTopic" value="${groovy: webSiteId + '_' + requestAttributes._CURRENT_VIEW_}"/>-->
                 <set field="helpTopic" value="${groovy: parameters.componentName.toUpperCase()
+ '_' + requestAttributes._CURRENT_VIEW_}"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
(original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Fri Dec 16 08:27:25 2011
@@ -20,6 +20,7 @@ package org.ofbiz.order.shoppingcart;
 
 import javolution.util.FastList;
 import javolution.util.FastMap;
+
 import org.ofbiz.base.util.*;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.DelegatorFactory;
@@ -575,8 +576,10 @@ public class ShoppingCart implements Ite
                     this, Boolean.TRUE, Boolean.TRUE, parentProductId, Boolean.FALSE, Boolean.FALSE);
         }
         // add order item attributes
-        for (Entry<String, String> entry : orderItemAttributes.entrySet()) {
-            item.setOrderItemAttribute(entry.getKey(), entry.getValue());
+        if (UtilValidate.isNotEmpty(orderItemAttributes)) {
+            for (Entry<String, String> entry : orderItemAttributes.entrySet()) {
+                item.setOrderItemAttribute(entry.getKey(), entry.getValue());
+            }
         }
 
         return this.addItem(0, item);

Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml Fri Dec
16 08:27:25 2011
@@ -1196,6 +1196,9 @@
         <value xml:lang="zh">称谓</value>
         <value xml:lang="zh_TW">稱謂</value>
     </property>
+    <property key="FormFieldTitle_personalImage">
+        <value xml:lang="en">Personal Image</value>
+    </property>
     <property key="FormFieldTitle_preferredContactMechId">
         <value xml:lang="de">Bevorzugter Kontaktmechanismus ID</value>
         <value xml:lang="en">Preferred Contact Mech Id</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml Fri
Dec 16 08:27:25 2011
@@ -159,6 +159,7 @@ under the License.
     </form>
 
     <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson">
+        <field name="personalImage" use-when="partyContentId!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image
value="${personalImage}"/></field>
         <field name="partyId"><display/></field>
         <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle}
${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field>
         <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml
(original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml
Fri Dec 16 08:27:25 2011
@@ -43,6 +43,7 @@
                 <set field="partyContentId" from-field="partyContentList[0].contentId"/>
                 <set field="partyContent" value="${groovy: partyContentId!=null?&quot;/content/control/stream?contentId=&quot;
+ partyContentId : &quot;&quot;}"/>
                 <set field="partyGroupLogoLinkUrl" from-field="partyContent" default-value="${lookupGroup.logoImageUrl}"
global="true"/>
+                <set field="personalImage" from-field="partyContent"/>
             </actions>
             <widgets>
                 <section>

Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
(original)
+++ ofbiz/branches/jackrabbit20100709/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml
Fri Dec 16 08:27:25 2011
@@ -191,6 +191,12 @@ under the License.
 
     <!--  WorkEffort CommunicationEvents requests -->
     <request-map uri="ListWorkEffortCommEvents"><security https="true" auth="true"/><response
name="success" type="view" value="ListWorkEffortCommEvents"/></request-map>
+    <request-map uri="createCommunicationEvent">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createCommunicationEventWorkEff"/>
+        <response name="success" type="view" value="ListWorkEffortCommEvents"/>
+        <response name="error" type="view" value="ListWorkEffortCommEvents"/>
+    </request-map>
     <request-map uri="createWorkEffortCommEvent">
         <security https="true" auth="true"/>
         <event type="service" invoke="createCommunicationEventWorkEff"/>
@@ -604,6 +610,7 @@ under the License.
     <request-map uri="LookupCommEvent"><security https="true" auth="true"/><response
name="success" type="view" value="LookupCommEvent"/></request-map>
     <request-map uri="LookupContactMech"><security https="true" auth="true"/><response
name="success" type="view" value="LookupContactMech"/></request-map>
     <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response
name="success" type="view" value="LookupPreferredContactMech"/></request-map>
+    <request-map uri="LookupContactList"><security https="true" auth="true"/><response
name="success" type="view" value="LookupContactList"/></request-map>
 
     <request-map uri="LookupProduct"><security https="true" auth="true"/><response
name="success" type="view" value="LookupProduct"/></request-map>
     <request-map uri="LookupVariantProduct"><security https="true" auth="true"/><response
name="success" type="view" value="LookupVariantProduct"/></request-map>
@@ -748,6 +755,7 @@ under the License.
     <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent"
type="screen"/>
     <view-map name="LookupContactMech" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupContactMech"/>
     <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
+    <view-map name="LookupContactList" type="screen" page="component://party/widget/partymgr/PartyContactListScreens.xml#ListLookupContactList"/>
 
     <view-map name="EditAgreementWorkEffortApplics" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditAgreementWorkEffortApplics"/>
     <view-map name="LookupAgreement" page="component://accounting/widget/LookupScreens.xml#LookupAgreement"
type="screen"/>

Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
(original)
+++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
Fri Dec 16 08:27:25 2011
@@ -25,6 +25,7 @@ import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Reader;
+import java.nio.ByteBuffer;
 import java.sql.Blob;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -324,16 +325,20 @@ public abstract class JdbcValueHandler<T
         }
         @Override
         protected void castAndSetValue(PreparedStatement ps, int parameterIndex, Object obj)
throws SQLException {
-            try {
-                // FIXME: This is here for backwards compatibility. Client code
-                // that uses a Blob java-type for a byte array should use a
-                // byte[] java-type instead.
-                byte[] bytes = (byte[]) obj;
-                Debug.logWarning("Blob java-type used for byte array. Use byte[] java-type
instead.", module);
-                ps.setBytes(parameterIndex, bytes);
-                return;
-            } catch (ClassCastException e) {}
-            ps.setBlob(parameterIndex, (Blob) obj);
+            // FIXME: This is here for backwards compatibility. Client code
+            // that uses a Blob java-type for a byte array should use a
+            // byte[] java-type instead.
+            if (obj instanceof Blob) {
+                ps.setBlob(parameterIndex, (Blob)obj);
+            } else if (obj instanceof byte[]) {
+                ps.setBytes(parameterIndex, (byte[]) obj);
+            } else if (obj instanceof ByteBuffer) {
+                ps.setBytes(parameterIndex, ((ByteBuffer)obj).array());
+            } else {
+                Debug.logError("JdbcValueHandler.castAndSetValue(): Unexpected type found.
type=" + obj.getClass().getName(), module);
+                throw new IllegalArgumentException(obj.getClass().getName());
+            }
+            return;
         }
         @Override
         public Object getValue(ResultSet rs, int columnIndex) throws SQLException {

Modified: ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
(original)
+++ ofbiz/branches/jackrabbit20100709/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
Fri Dec 16 08:27:25 2011
@@ -26,6 +26,7 @@ import javolution.util.FastList;
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
@@ -321,11 +322,28 @@ public class CallService extends MethodO
         String messagePrefixStr = messagePrefix.getMessage(methodContext.getLoader(), methodContext);
         String messageSuffixStr = messageSuffix.getMessage(methodContext.getLoader(), methodContext);
 
-        String errorMessage = ServiceUtil.makeErrorMessage(result, messagePrefixStr, messageSuffixStr,
errorPrefixStr, errorSuffixStr);
-        if (UtilValidate.isNotEmpty(errorMessage) && breakOnError) {
-            errorMessage += UtilProperties.getMessage(resource, "simpleMethod.error_show_service_name",
UtilMisc.toMap("serviceName", serviceName, "methodName", simpleMethod.getMethodName()), locale);
+        String errorMessage = null;
+        List<String> errorMessageList = null;
+        // See if there is a single message
+        if (result.containsKey(ModelService.ERROR_MESSAGE)) {
+            errorMessage = ServiceUtil.makeErrorMessage(result, messagePrefixStr, messageSuffixStr,
errorPrefixStr, errorSuffixStr);
+        } else if (result.containsKey(ModelService.ERROR_MESSAGE_LIST)) {
+            errorMessageList = UtilGenerics.checkList(result.get(ModelService.ERROR_MESSAGE_LIST));
+        }
+
+        if ((UtilValidate.isNotEmpty(errorMessage) || UtilValidate.isNotEmpty(errorMessageList))
&& breakOnError) {
             if (methodContext.getMethodType() == MethodContext.EVENT) {
-                methodContext.putEnv(simpleMethod.getEventErrorMessageName(), errorMessage);
+                if (UtilValidate.isNotEmpty(errorMessage)){
+                    if (Debug.verboseOn()){
+                        errorMessage += UtilProperties.getMessage(resource, "simpleMethod.error_show_service_name",
UtilMisc.toMap("serviceName", serviceName, "methodName", simpleMethod.getMethodName()), locale);
+                    }
+                    methodContext.putEnv(simpleMethod.getEventErrorMessageName(), errorMessage);
+                } else {
+                    if (Debug.verboseOn()){
+                        errorMessageList.add(UtilProperties.getMessage(resource, "simpleMethod.error_show_service_name",
UtilMisc.toMap("serviceName", serviceName, "methodName", simpleMethod.getMethodName()), locale));
+                    }
+                    methodContext.putEnv(simpleMethod.getEventErrorMessageListName(), errorMessageList);
+                }
             } else if (methodContext.getMethodType() == MethodContext.SERVICE) {
                 ServiceUtil.addErrors(UtilMisc.<String, String>getListFromMap(methodContext.getEnvMap(),
this.simpleMethod.getServiceErrorMessageListName()),
                         UtilMisc.<String, String, Object>getMapFromMap(methodContext.getEnvMap(),
this.simpleMethod.getServiceErrorMessageMapName()), result);
@@ -344,7 +362,7 @@ public class CallService extends MethodO
         }
 
         String defaultMessageStr = defaultMessage.getMessage(methodContext.getLoader(), methodContext);
-        if (UtilValidate.isEmpty(errorMessage) && UtilValidate.isEmpty(successMessage)
&& UtilValidate.isNotEmpty(defaultMessageStr)) {
+        if (UtilValidate.isEmpty(errorMessage) && UtilValidate.isEmpty(errorMessageList)
&& UtilValidate.isEmpty(successMessage) && UtilValidate.isNotEmpty(defaultMessageStr))
{
             if (methodContext.getMethodType() == MethodContext.EVENT) {
                 methodContext.putEnv(simpleMethod.getEventEventMessageName(), defaultMessageStr);
             } else if (methodContext.getMethodType() == MethodContext.SERVICE) {

Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/controller.xml
(original)
+++ ofbiz/branches/jackrabbit20100709/framework/webtools/webapp/webtools/WEB-INF/controller.xml
Fri Dec 16 08:27:25 2011
@@ -59,11 +59,6 @@ under the License.
         <response name="error" type="none"/>
         <response name="success" type="none"/>
     </request-map>
-    <request-map uri="runService">
-        <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="runService"/>
-        <response name="success" type="view" value="main"/>
-        <response name="error" type="view" value="main"/>
-    </request-map>
 
     <request-map uri="ping">
         <event type="service" invoke="ping"/>
@@ -316,6 +311,13 @@ under the License.
         <response name="sync_success" type="view" value="serviceResult"/>
         <response name="error" type="view" value="scheduleJob"/>
     </request-map>
+    <request-map uri="scheduleServiceSync">
+        <security https="true" auth="true"/>
+        <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="scheduleService"/>
+        <response name="success" type="view" value="serviceResult"/>
+        <response name="sync_success" type="view" value="serviceResult"/>
+        <response name="error" type="view" value="runService"/>
+    </request-map>
     <request-map uri="serviceResult">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="serviceResult"/>

Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/ServiceScreens.xml Fri Dec
16 08:27:25 2011
@@ -167,7 +167,7 @@ under the License.
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleScheduleJob}">
                             <platform-specific>
-                                <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameter.ftl"/></html>
+                                <html><html-template location="component://webtools/webapp/webtools/service/setServiceParameterSync.ftl"/></html>
                             </platform-specific>
                         </screenlet>
                     </decorator-section>

Modified: ofbiz/branches/jackrabbit20100709/rc.ofbiz.for.ubuntu
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/rc.ofbiz.for.ubuntu?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/rc.ofbiz.for.ubuntu (original)
+++ ofbiz/branches/jackrabbit20100709/rc.ofbiz.for.ubuntu Fri Dec 16 08:27:25 2011
@@ -26,6 +26,7 @@
 
 # the userlogin the script should run under and is the home dirname, in this case /home/ofbiz/ofbiz
 OFBIZUSER="ofbiz"
+OFBIZDIR=""ofbiz"
 
 #============== no need to change anything below this line =======================
 
@@ -37,13 +38,13 @@ start() {
         return 0
     fi
     if [ "$USER" = "$OFBIZUSER" ]; then
-        echo "starting standard /home/$OFBIZUSER/ofbiz/startofbiz.sh"
-        cd /home/$OFBIZUSER/ofbiz
+        echo "starting standard /home/$OFBIZUSER/$OFBIZDIR/startofbiz.sh"
+        cd /home/$OFBIZUSER/$OFBIZDIR
         ./startofbiz.sh
         if [ $? = 0 ]; then 
             echo "start success"
         else
-            echo "starting ofbiz user: $OFBIZUSER failed return code: $?"
+            echo "starting ofbiz user: $OFBIZUSER in dir: $OFBIZDIR failed return code: $?"
         fi
         return 0
     fi
@@ -51,8 +52,8 @@ start() {
 
 stop() {
     if [ "$USER" = "$OFBIZUSER" ]; then
-        echo "stopping standard /home/$OFBIZUSER/ofbiz/stopofbiz.sh"
-        cd /home/$OFBIZUSER/ofbiz
+        echo "stopping standard /home/$OFBIZUSER/$OFBIZDIR/stopofbiz.sh"
+        cd /home/$OFBIZUSER/$OFBIZDIR
 	    MAXCOUNT=10
         COUNTER=0
         until [ $COUNTER -gt $MAXCOUNT ]; do
@@ -75,9 +76,8 @@ stop() {
 checkUser() {
     if [ "$USER" != "$OFBIZUSER" ]; then
         if [ "$USER" = "" ]; then
-# mount disks if required in Amazon EC2         
-            echo "Mounting data disk at boot"
-            mount /dev/sdf /backup 
+#           echo "Mounting data disk at boot"
+#           mount /dev/sdf /backup 
             exec su - $OFBIZUSER -c "$0 $1 "
 	    else
 	        exec sudo -u $OFBIZUSER $0 $1 
@@ -107,10 +107,10 @@ case "$1" in
     "status")
         running
         if [ "$OFBIZ_PROCS" = "" ]; then
-            echo "OFBiz for user: $OFBIZUSER is stopped"
+            echo "OFBiz for user: $OFBIZUSER in dir: $OFBIZDIR is stopped"
             exit 1
         else
-            echo "OFBiz for user: $OFBIZUSER is running"
+            echo "OFBiz for user: $OFBIZUSER in dir: $OFBIZDIR is running"
             exit 0
         fi
     ;;

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
(original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
Fri Dec 16 08:27:25 2011
@@ -49,7 +49,7 @@ under the License.
         <set value="hhFacility Receipt" field="receiveCtx.comments"/>
         <set from-field="nowTimestamp" field="receiveCtx.datetimeReceived"/>
         <set value="NON_SERIAL_INV_ITEM" field="receiveCtx.inventoryItemTypeId"/>
-        <calculate field="receiveCtx.quantityRejected" type="Double">
+        <calculate field="receiveCtx.quantityRejected" type="BigDecimal">
             <number value="0"/>
         </calculate>
         <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/servicedef/services_hhfacility.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/servicedef/services_hhfacility.xml?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/servicedef/services_hhfacility.xml
(original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/servicedef/services_hhfacility.xml
Fri Dec 16 08:27:25 2011
@@ -33,7 +33,7 @@ under the License.
         <description>Receive Product Qty to Facility</description>
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
-        <attribute name="productQty" type="Double" mode="IN" optional="false"/>
+        <attribute name="productQty" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="productLocation" type="String" mode="IN" optional="true"/>
     </service>
 
@@ -57,7 +57,7 @@ under the License.
         <attribute name="facilityId" type="String" mode="IN" optional="false"/>
         <attribute name="locationSeqId" type="String" mode="IN" optional="false"/>
         <attribute name="productId" type="String" mode="IN" optional="false"/>
-        <attribute name="quantity" type="Double" mode="IN" optional="false"/>
+        <attribute name="quantity" type="BigDecimal" mode="IN" optional="false"/>
         <attribute name="locationSeqIdNew" type="String" mode="IN" optional="true"/>
     </service>
 

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java?rev=1215058&r1=1215057&r2=1215058&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java
(original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java
Fri Dec 16 08:27:25 2011
@@ -19,6 +19,7 @@
 
 package org.ofbiz.hhfacility;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -107,7 +108,7 @@ public class FacilityServices {
         String facilityId = (String) context.get("facilityId");
         String productId = (String) context.get("productId");
         String locationSeqId = (String) context.get("locationSeqId");
-        Double quantity = (Double) context.get("quantity");
+        BigDecimal quantity = (BigDecimal) context.get("quantity");
         if (UtilValidate.isEmpty(productId) || UtilValidate.isEmpty(facilityId)) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductIdOrFacilityIdNotFound",
locale));
         }
@@ -127,7 +128,7 @@ public class FacilityServices {
             Debug.logError(e, "updateProductStocktake failed getting inventory counts", module);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ProductErrorUpdateProductStockTake",
locale));
         }
-        int qoh = ((Double)invAvailability.get("quantityOnHandTotal")).intValue();
+        int qoh = ((BigDecimal)invAvailability.get("quantityOnHandTotal")).intValue();
         if (quantity.intValue() == qoh) {
             // No change required.
             Debug.logInfo("updateProductStocktake No change required quantity("+quantity+")
= qoh("+qoh+")", module);



Mime
View raw message