svn commit: r1747770 - in /ofbiz/trunk: applications/accounting/widget/ applications/humanres/widget/ applications/marketing/widget/sfa/ applications/order/widget/ordermgr/ applications/party/groovyScripts/ applications/party/webapp/partymgr/WEB-INF/ac...

[Deepak Dixit-5]

Author: deepak
Date: Fri Jun 10 18:39:22 2016
New Revision: 1747770

URL: http://svn.apache.org/viewvc?rev=1747770&view=rev
Log:
(OFBIZ-7228) Relocate .groovy files in the party component

Added:
    ofbiz/trunk/applications/party/groovyScripts/
      - copied from r1747740, ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/
Removed:
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/
Modified:
    ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
    ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml
    ofbiz/trunk/framework/common/widget/LookupScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
    ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Fri Jun 10 18:39:22 2016
@@ -33,7 +33,7 @@ under the License.
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="AccountingInvoice"/>
                 <script location="component://accounting/groovyScripts/invoice/EditInvoice.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
+                <script location="component://party/groovyScripts/party/GetMyCompany.groovy"/>
             </actions>
             <widgets>
                 <section>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Fri Jun 10 18:39:22 2016
@@ -601,7 +601,7 @@ under the License.
         <section>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
+                <script location="component://party/groovyScripts/party/GetMyCompany.groovy"/>
                 <entity-condition list="invoices" entity-name="Invoice">
                     <condition-list combine="and">
                         <condition-expr field-name="partyId" operator="equals" from-field="myCompanyId"/>

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Fri Jun 10 18:39:22 2016
@@ -413,7 +413,7 @@ under the License.
     <screen name="CommonMyCommunicationEventDecorator">
         <section>
             <actions>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
+                <script location="component://party/groovyScripts/communication/GetMyCommunicationEventRole.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Fri Jun 10 18:39:22 2016
@@ -85,8 +85,8 @@ under the License.
                 <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
+                <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+                <script location="component://party/groovyScripts/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Fri Jun 10 18:39:22 2016
@@ -200,8 +200,8 @@ under the License.
 
                 <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy"/>
+                <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+                <script location="component://party/groovyScripts/party/SetRoleVars.groovy"/>
                 <set field="parameters.partyId" from-field="partyId"/>
                 <set field="parameters.partyGroupId" from-field="partyGroupId"/>
             </actions>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Fri Jun 10 18:39:22 2016
@@ -573,7 +573,7 @@ under the License.
                         <if-compare field="otherContacts" operator="equals" value="Y"/>
                     </condition>
                     <actions>
-                        <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
+                        <script location="component://party/groovyScripts/party/GetMyCompany.groovy"/>
                         <set field="fromPartyId" from-field=""/>
                         <set field="notFromPartyId" from-field="userLogin.partyId"/>
                         <set field="screenletTitle" from-field="uiLabelMap.OrderOpenCompanyCustomerRequests"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Fri Jun 10 18:39:22 2016
@@ -185,7 +185,7 @@ under the License.
     <form name="EditInternalNote" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
         <actions>
             <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString(&quot;yyyy-MM-dd HH:mm:ss.S&quot;)}" type="String"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy"/>
+            <script location="component://party/groovyScripts/communication/recentVisitor.groovy"/>
         </actions>
         <alt-target use-when="communicationEvent!=null" target="updateCommunicationEvent"/>
         <field name="form"><hidden/></field>
@@ -938,7 +938,7 @@ under the License.
 
     <form name="allocateMsgToPartyForm" type="single" target="allocateMsgToParty" title="create a new party for a unknown incoming email address">
         <actions>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy"/>
+            <script location="component://party/groovyScripts/communication/getPartyEmailFromCommEventInfo.groovy"/>
         </actions>
         <field name="form"><hidden value="list"/></field>
         <field name="portalPageId"><hidden value="${parameters.portalPageId}"/></field>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Fri Jun 10 18:39:22 2016
@@ -24,7 +24,7 @@ under the License.
         <section>
             <actions>
                 <set field="headerItem" value="comm"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
+                <script location="component://party/groovyScripts/communication/GetMyCommunicationEventRole.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -60,7 +60,7 @@ under the License.
     <screen name="CommonMyCommunicationEventDecorator">
         <section>
             <actions>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
+                <script location="component://party/groovyScripts/communication/GetMyCommunicationEventRole.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml Fri Jun 10 18:39:22 2016
@@ -43,7 +43,7 @@ under the License.
             <set field="inputFields" from-field="parameters"/>
             <set field="orderBy" value="partyId"/>
             <set field="entityName" value="PartyNameView"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
@@ -80,7 +80,7 @@ under the License.
             <set field="inputFields" from-field="parameters"/>
             <set field="orderBy" value="partyId"/>
             <set field="entityName" value="PartyNameContactMechView"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <row-actions>
             <set field="name" value="${firstName} ${middleName} ${lastName} ${groupName}"/>
@@ -114,7 +114,7 @@ under the License.
             <set field="inputFields" from-field="parameters"/>
             <set field="orderBy" value="partyId"/>
             <set field="entityName" value="PartyRoleNameDetail"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
@@ -182,7 +182,7 @@ under the License.
     <form name="listLookupPerson" type="list" list-name="listIt" paginate-target="LookupPerson"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <!--<auto-fields-entity entity-name="Person" default-field-type="display"/>-->
         <field name="partyId"  widget-style="smallSubmit" title="${uiLabelMap.PartyPartyId}">
@@ -215,7 +215,7 @@ under the License.
         <actions>
             <set field="inputFields" from-field="requestParameters"/>
             <set field="entityName" value="PartyAndUserLoginAndPerson"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <!--<auto-fields-entity entity-name="PartyAndUserLoginAndPerson" default-field-type="display"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
@@ -245,7 +245,7 @@ under the License.
         <actions>
             <set field="inputFields" from-field="requestParameters"/>
             <set field="entityName" value="UserLoginAndPartyDetails"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
@@ -269,7 +269,7 @@ under the License.
     <form name="listLookupPartyGroup" type="list" list-name="listIt" paginate-target="LookupPartyGroup"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
         <!--<auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
@@ -413,7 +413,7 @@ under the License.
         <actions>
             <set field="inputFields" from-field="parameters"/>
             <set field="entityName" value="PartyAndContactMech"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindLookUp.groovy"/>
+            <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
         </actions>
 
         <field name="contactMechId"  widget-style="buttontext">

Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupScreens.xml Fri Jun 10 18:39:22 2016
@@ -46,7 +46,7 @@ under the License.
                 <set field="displayFields" value="[firstName, lastName, groupName]"/>
                 
                 <!-- optional: additional entity condition (named andCondition) added to search query -->
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>
+                <script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -153,7 +153,7 @@ under the License.
                 <set field="queryString" from-field="result.queryString"/>                
                 <set field="entityName" value="PartyAndPerson"/>
                 <set field="searchFields" value="[partyId, firstName, middleName, lastName]"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>                
+                <script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -229,7 +229,7 @@ under the License.
                 <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
                 <set field="searchFields" value="[userLoginId, partyId, firstName, lastName]"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>                
+                <script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -258,7 +258,7 @@ under the License.
                 <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
                 <set field="searchFields" value="[userLoginId, partyId, firstName, lastName, groupName]"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>                
+                <script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -282,7 +282,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PartyLookupPartyGroup}"/>
                 <set field="entityName" value="PartyAndGroup"/>
                 <set field="searchFields" value="[partyId, groupName, comments]"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>                
+                <script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -380,7 +380,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PartyLookupContactMech}"/>
                 <set field="entityName" value="PartyAndContactMech"/>
                 <set field="searchFields" value="[contactMechId, partyId, contactMechTypeId, infoString, paToName]"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>
+                <script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
                 <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
@@ -409,7 +409,7 @@ under the License.
                 <set field="entityName" value="PartyRoleAndPartyDetail"/>
                 <set field="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
                 <set field="searchFields" value="[partyId, groupName, partyGroupComments]"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy"/>      
+                <script location="component://party/groovyScripts/party/StatusCondition.groovy"/>
                 <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition([context.andCondition,
                     org.ofbiz.entity.condition.EntityCondition.makeCondition(&quot;roleTypeId&quot;, &quot;INTERNAL_ORGANIZATIO&quot;)])}"/>
             </actions>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Fri Jun 10 18:39:22 2016
@@ -1113,7 +1113,7 @@ under the License.
        >
         <actions>
             <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy"/>
+            <script location="component://party/groovyScripts/party/UnAppliedInvoicesForParty.groovy"/>
         </actions>
         <field name="invoiceId">
             <display-entity entity-name="Invoice">
@@ -1134,7 +1134,7 @@ under the License.
        >
         <actions>
             <set field="actualCurrency" from-field="actualCurrency" default-value="true" type="Boolean"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy"/>
+            <script location="component://party/groovyScripts/party/UnAppliedPaymentsForParty.groovy"/>
         </actions>
         <field name="paymentId"><hidden/></field>
         <field name="paymentId">
@@ -1159,7 +1159,7 @@ under the License.
         <actions>
             <set field="actualCurrency" from-field="actualCurrency" default-value="true"/>
             <set field="actualCurrencyUomId" from-field="actualCurrencyUomId" default-value="${defaultOrganizationPartyCurrencyUomId}"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy"/>
+            <script location="component://party/groovyScripts/party/PartyFinancialHistory.groovy"/>
         </actions>
         <field position="1" name="totalSalesInvoice"><display type="currency" currency="${actualCurrencyUomId}"/></field>
         <field position="2" name="totalPurchaseInvoice"><display type="currency" currency="${actualCurrencyUomId}"/></field>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri Jun 10 18:39:22 2016
@@ -386,7 +386,7 @@
     </menu>
     <menu name="MyCommSubTabBar" menu-container-style="button-bar button-style-2">
         <actions>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/>
+            <script location="component://party/groovyScripts/communication/GetMyCommunicationEventRole.groovy"/>
         </actions>
         <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
             <condition>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Jun 10 18:39:22 2016
@@ -29,7 +29,7 @@ under the License.
                 <set field="headerItem" value="find"/>
                 <set field="tabButtonItem" value="findparty"/>
                 <set field="initialyCollapsed" value="${groovy:'Y'.equals(parameters.hideFields)}" type="String"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindParty.groovy"/>
+                <script location="component://party/groovyScripts/party/FindParty.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -68,7 +68,7 @@ under the License.
                 <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
+                <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -400,7 +400,7 @@ under the License.
 
                 <set field="labelTitleProperty" value="PartyShoppingLists"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy"/>
+                <script location="component://party/groovyScripts/party/EditShoppingList.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -423,8 +423,8 @@ under the License.
 
                 <set field="labelTitleProperty" value="PageTitleEditContactMech"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/EditContactMech.groovy"/>
+                <script location="component://party/groovyScripts/HasPartyPermissions.groovy"/>
+                <script location="component://party/groovyScripts/party/EditContactMech.groovy"/>
 
                 <set field="dependentForm" value="editcontactmechform"/>
                 <set field="paramKey" value="countryGeoId"/>
@@ -826,7 +826,7 @@ under the License.
             <actions>
                 <set field="titleProperty" value="PageTitleAddressMatches"/>
                 <set field="headerItem" value="addrmap"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy"/>
+                <script location="component://party/groovyScripts/party/FindMatches.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1122,7 +1122,7 @@ under the License.
             <actions>
                 <set field="titleProperty" value="PageTitlePartyGeoLocation"/>
                 <set field="tabButtonItem" value="PartyGeoLocation"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy"/>
+                <script location="component://party/groovyScripts/party/PartyGeoLocation.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1162,7 +1162,7 @@ under the License.
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="titleProperty" value="PageTitlePartyGeoLocation"/>
                 <set field="tabButtonItem" value="PartyGeoLocation"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy"/>
+                <script location="component://party/groovyScripts/party/PartyGeoLocation.groovy"/>
             </actions>
             <widgets>
                 <label>${uiLabelMap.CommonLatitude} ${latestGeoPoint.latitude}</label>
@@ -1178,7 +1178,7 @@ under the License.
                 <set field="titleProperty" value="PageTitlePartyGeoLocation"/>
                 <set field="tabButtonItem" value="PartyGeoLocation"/>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetGeoLocation.groovy"/>
+                <script location="component://party/groovyScripts/party/GetGeoLocation.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -1267,7 +1267,7 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="postalAddressTemplateSuffix" value=".ftl"/>
                 <set field="addressTemplatePath" value="${sys:getProperty('ofbiz.home')}/applications/party/webapp/partymgr/party/contactmechtemplates/"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy"/>
+                <script location="component://party/groovyScripts/party/GetPostalAddressTemplate.groovy"/>
             </actions>
             <widgets>
                 <platform-specific>
@@ -1284,7 +1284,7 @@ under the License.
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="postalAddressTemplateSuffix" value=".fo.ftl"/>
                 <set field="addressTemplatePath" value="${sys:getProperty('ofbiz.home')}/applications/party/template/party/contactmechtemplates/"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy"/>
+                <script location="component://party/groovyScripts/party/GetPostalAddressTemplate.groovy"/>
             </actions>
             <widgets>
                 <platform-specific>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Fri Jun 10 18:39:22 2016
@@ -25,7 +25,7 @@ under the License.
         <section>
             <actions>
                 <set field="headerItem" value="find"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
+                <script location="component://party/groovyScripts/HasPartyPermissions.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -62,8 +62,8 @@ under the License.
                 <set field="tabButtonItem" value="editcreditcard"/>
                 <set field="cardNumberMinDisplay" value="min"/>
                 <set field="showToolTip" value="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/EditPaymentMethod.groovy"/>
+                <script location="component://party/groovyScripts/HasPartyPermissions.groovy"/>
+                <script location="component://party/groovyScripts/party/EditPaymentMethod.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="PaymentMethodDecorator">
@@ -82,8 +82,8 @@ under the License.
                 <set field="titleProperty" value="PageTitleEditGiftCard"/>
                 <set field="tabButtonItem" value="editgiftcard"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/EditPaymentMethod.groovy"/>
+                <script location="component://party/groovyScripts/HasPartyPermissions.groovy"/>
+                <script location="component://party/groovyScripts/party/EditPaymentMethod.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="PaymentMethodDecorator">
@@ -102,8 +102,8 @@ under the License.
                 <set field="titleProperty" value="PageTitleEditEftAccount"/>
                 <set field="tabButtonItem" value="editeftaccount"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/EditPaymentMethod.groovy"/>
+                <script location="component://party/groovyScripts/HasPartyPermissions.groovy"/>
+                <script location="component://party/groovyScripts/party/EditPaymentMethod.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="PaymentMethodDecorator">

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Fri Jun 10 18:39:22 2016
@@ -136,8 +136,8 @@
             <actions>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
+                <script location="component://party/groovyScripts/party/GetContactMechs.groovy"/>
+                <script location="component://party/groovyScripts/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
             <widgets>
                 <platform-specific>
@@ -169,7 +169,7 @@
             <actions>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy"/>
+                <script location="component://party/groovyScripts/party/GetPaymentMethods.groovy"/>
             </actions>
             <widgets>
                 <platform-specific>
@@ -224,7 +224,7 @@
     <screen name="Cart">
         <section>
             <actions>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy"/>
+                <script location="component://party/groovyScripts/party/GetCurrentCart.groovy"/>
             </actions>
             <widgets>
                 <platform-specific>
@@ -240,7 +240,7 @@
         <section>
             <actions>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy"/>
+                <script location="component://party/groovyScripts/party/GetLoyaltyPoints.groovy"/>
             </actions>
             <widgets>
                 <platform-specific>

Modified: ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml Fri Jun 10 18:39:22 2016
@@ -95,7 +95,7 @@ under the License.
                 <set field="headerItem" value="visits"/>
                 <set field="tabButtonItem" value="visitdetail"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy"/>
+                <script location="component://party/groovyScripts/visit/VisitDetails.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Fri Jun 10 18:39:22 2016
@@ -44,7 +44,7 @@ under the License.
                 <set field="displayFields" value="[geoId, geoName, geoCode]"/>
                 
                 <!-- optional: additional entity condition (named andCondition) added to search query -->
-                <!-- example : script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy" /-->
+                <!-- example : script location="component://party/groovyScripts/party/StatusCondition.groovy" /-->
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
@@ -81,7 +81,7 @@ under the License.
                 <set field="displayFields" value="[geoId, geoName, geoCode]"/>
 
                 <!-- optional: additional entity condition (named andCondition) added to search query -->
-                <!-- example : script location="component://party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy" /-->
+                <!-- example : script location="component://party/groovyScripts/party/StatusCondition.groovy" /-->
                 
             </actions>
             <widgets>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Jun 10 18:39:22 2016
@@ -693,8 +693,8 @@ under the License.
 
                 <set field="labelTitleProperty" value="PageTitleEditContactMech"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/EditContactMech.groovy"/>
+                <script location="component://party/groovyScripts/HasPartyPermissions.groovy"/>
+                <script location="component://party/groovyScripts/party/EditContactMech.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -749,7 +749,7 @@ under the License.
                 <entity-one entity-name="Party" use-cache="true" value-field="party"/>
                 <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson"/>
                 <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy"/>
+                <script location="component://party/groovyScripts/communication/FindCommEventContactMechs.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -827,7 +827,7 @@ under the License.
                 <set field="headerItem" value="visits"/>
                 <set field="tabButtonItem" value="showvisits"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy"/>
+                <script location="component://party/groovyScripts/visit/ShowVisits.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
@@ -858,7 +858,7 @@ under the License.
                 <set field="headerItem" value="visits"/>
                 <set field="tabButtonItem" value="visitdetail"/>
 
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy"/>
+                <script location="component://party/groovyScripts/visit/VisitDetails.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Fri Jun 10 18:39:22 2016
@@ -79,8 +79,8 @@ under the License.
                 <set field="headerItem" value="find"/>
                 <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
                 <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
+                <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
+                <script location="component://party/groovyScripts/party/GetUserLoginPrimaryEmail.groovy"/>
                 <entity-condition entity-name="RoleTypeAndParty" list="partyRoles">
                     <condition-list combine="and">
                         <condition-expr field-name="partyId" operator="equals" value="${parameters.partyId}"/>

Modified: ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml?rev=1747770&r1=1747769&r2=1747770&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/widget/ResourceScreens.xml Fri Jun 10 18:39:22 2016
@@ -95,7 +95,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/control.progress_bar.js" global="true"/>
                 <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/progress_bar.css" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/partymgr/static/PartyProfileContent.js" global="true"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
+                <script location="component://party/groovyScripts/party/ViewProfile.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">