You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/06/10 17:21:10 UTC

svn commit: r1747756 - in /ofbiz/trunk: applications/content/groovyScripts/ applications/content/webapp/content/WEB-INF/actions/ applications/content/widget/ applications/content/widget/cms/ applications/content/widget/compdoc/ applications/content/wid...

Author: deepak
Date: Fri Jun 10 17:21:10 2016
New Revision: 1747756

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

Added:
    ofbiz/trunk/applications/content/groovyScripts/
      - copied from r1747740, ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/
Removed:
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/
Modified:
    ofbiz/trunk/applications/content/widget/SurveyScreens.xml
    ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
    ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
    ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
    ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
    ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
    ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
    ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml

Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Fri Jun 10 17:21:10 2016
@@ -180,7 +180,7 @@ under the License.
                 <set field="surveyId" from-field="parameters.surveyId"/>
                 <entity-one entity-name="Survey" value-field="survey"/>
 
-                <script location="component://content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy"/>
+                <script location="component://content/groovyScripts/survey/EditSurveyQuestions.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonSurveyDecorator">
@@ -249,7 +249,7 @@ under the License.
                 <set field="surveyId" from-field="parameters.surveyId"/>
                 <entity-one entity-name="Survey" value-field="survey"/>
 
-                <script location="component://content/webapp/content/WEB-INF/actions/survey/ViewSurveyResponses.groovy"/>
+                <script location="component://content/groovyScripts/survey/ViewSurveyResponses.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonSurveyDecorator">
@@ -289,7 +289,7 @@ under the License.
 
                 <set field="surveyResponseId" from-field="parameters.surveyResponseId"/>
                 <entity-one entity-name="SurveyResponse" value-field="surveyResponse"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/survey/EditSurveyResponse.groovy"/>
+                <script location="component://content/groovyScripts/survey/EditSurveyResponse.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonSurveyDecorator">

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Fri Jun 10 17:21:10 2016
@@ -120,7 +120,7 @@ under the License.
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
                 <property-map map-name="uiLabelMap" resource="PartyUiLabels"/>
                 <entity-one entity-name="WebSite" value-field="webSite"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy"/>
+                <script location="component://content/groovyScripts/website/EditWebSiteParties.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}">
@@ -148,7 +148,7 @@ under the License.
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
                 <entity-one entity-name="WebSite" value-field="webSite"/>
 
-                <script location="component://content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy"/>
+                <script location="component://content/groovyScripts/website/WebSitePublishPoint.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}">
@@ -287,7 +287,7 @@ under the License.
                 <entity-one entity-name="Content" value-field="content"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy"/>
+                <script location="component://content/groovyScripts/website/WebSiteCMSMetaInfo.groovy"/>
             </actions>
             <widgets>
                 <container id="cmscontent" style="no-clear">

Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Fri Jun 10 17:21:10 2016
@@ -60,7 +60,7 @@ under the License.
     <screen name="CMSContentEdit">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditCMSContent"/>
                 <entity-one entity-name="Content" value-field="currentValue">
                     <field-map field-name="contentId" from-field="parameters.contentId"/>
@@ -73,7 +73,7 @@ under the License.
                 <set field="dataResourceId" from-field="parameters.drDataResourceId"/>
                 <set field="rootForumId" value="WebStoreFORUM"/>
                 <set field="rootForumId2" value="WebStoreCONTENT"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/FeaturePrep.groovy"/>
+                <script location="component://content/groovyScripts/cms/FeaturePrep.groovy"/>
                 <set field="menuContext.contentTarget" value="CMSContentEdit?contentId=${contentId}&amp;drDataResourceId=${dataResourceId}"/>
             </actions>
             <widgets>
@@ -117,7 +117,7 @@ under the License.
                 <set field="caMapKey" from-field="MASTER_caMapKey"/>
 
 
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy"/>
+                <script location="component://content/groovyScripts/cms/CmsEditAddPrep.groovy"/>
                 <set field="currentCMSMenuItemName" value="EditAddContent" to-scope="user"/>
                 <set field="enableEdit" value="true"/>
             </actions>
@@ -153,7 +153,7 @@ under the License.
                 <set field="caContentIdTo" from-field="parameters.contentId"/>
                 <set field="caMapKey" from-field="parameters.mapKey"/>
 
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy"/>
+                <script location="component://content/groovyScripts/cms/CmsEditAddPrep.groovy"/>
                 <set field="currentCMSMenuItemName" value="EditAddContent" to-scope="user"/>
             </actions>
             <widgets>
@@ -172,13 +172,13 @@ under the License.
     <screen name="CMSSites">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="ContentCMSSearchPage"/>
                 <set field="forumId" from-field="parameters.contentId"/>
                 <set field="defaultSiteId" value="WebStoreFORUM"/>
                 <set field="currentCMSMenuItemName" value="subsites" to-scope="user"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/UserPermPrep.groovy"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/MostRecentPrep.groovy"/>
+                <script location="component://content/groovyScripts/cms/UserPermPrep.groovy"/>
+                <script location="component://content/groovyScripts/cms/MostRecentPrep.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.cmsDecoratorLocation}">
@@ -197,7 +197,7 @@ under the License.
     <screen name="addSubSite">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleSearchContent"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Fri Jun 10 17:21:10 2016
@@ -1097,7 +1097,7 @@ under the License.
     <screen name="childTemplateLine">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/content/PrepSeqNo.groovy"/>
+                <script location="component://content/groovyScripts/content/PrepSeqNo.groovy"/>
             </actions>
             <widgets>
                 <include-menu name="childTemplateLine" location="component://content/widget/compdoc/CompDocMenus.xml"/>
@@ -1107,7 +1107,7 @@ under the License.
     <screen name="childInstanceLine">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/content/PrepSeqNo.groovy"/>
+                <script location="component://content/groovyScripts/content/PrepSeqNo.groovy"/>
                 <!--  find the most recent ContentAssoc/ContentRevisionItem view using the rootInstanceContentId
                       as the contentId value and rootInstanceRevSeqId for the revision
                       and the contentId of the current template part as the itemContentId

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Fri Jun 10 17:21:10 2016
@@ -156,7 +156,7 @@ under the License.
                <!-- <entity-condition entity-name="ContentAssocViewTo" list="contentAssoc">
                     <condition-expr field-name="contentIdStart" from-field="contentId" operator="equals"/>
                     </entity-condition>-->
-                <script location="component://content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy"/>
+                <script location="component://content/groovyScripts/content/GetContentLookupList.groovy"/>
             </actions>
             <widgets>
 <!--                <include-form name="ListDocument" location="component://content/widget/content/ContentForms.xml"/>-->
@@ -288,7 +288,7 @@ under the License.
     <screen name="EditContentRole">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditContentRole"/>
                 <set field="tabButtonItem" value="role"/>
 
@@ -314,7 +314,7 @@ under the License.
     <screen name="EditContentPurpose">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditContentPurpose"/>
                 <set field="tabButtonItem" value="purpose"/>
                 <set field="contentId" from-field="parameters.contentId"/>
@@ -338,7 +338,7 @@ under the License.
     <screen name="EditContentAttribute">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditContentAttribute"/>
                 <set field="tabButtonItem" value="attribute"/>
                 <set field="contentId" from-field="parameters.contentId"/>
@@ -398,7 +398,7 @@ under the License.
     <screen name="EditContentMetaData">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditContentMetadata"/>
                 <set field="tabButtonItem" value="metaData"/>
                 <set field="contentId" from-field="parameters.contentId"/>
@@ -422,7 +422,7 @@ under the License.
     <screen name="EditContentWorkEfforts">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditContentWorkEffort"/>
                 <set field="tabButtonItem" value="workEffort"/>
                 <set field="contentId" from-field="parameters.contentId"/>
@@ -474,7 +474,7 @@ under the License.
                 <set field="contentId" from-field="parameters.contentId"/>
                 <set field="viewSize" value="${parameters.VIEW_SIZE}" default-value="30" type="Integer"/>
                 <set field="viewIndex" value="${parameters.VIEW_INDEX}" default-value="0" type="Integer"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy"/>
+                <script location="component://content/groovyScripts/content/GetContentLookupList.groovy"/>
             </actions>
             <widgets>
                 <container id="Document">
@@ -601,7 +601,7 @@ under the License.
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleSearchResults"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/content/ContentSearchOptions.groovy"/>
+                <script location="component://content/groovyScripts/content/ContentSearchOptions.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="contentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -619,7 +619,7 @@ under the License.
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleSearchResults"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/content/ContentSearchResults.groovy"/>
+                <script location="component://content/groovyScripts/content/ContentSearchResults.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="contentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -636,7 +636,7 @@ under the License.
     <screen name="EditContentKeywords">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="PageTitleEditContentKeywords"/>
                 <set field="tabButtonItem" value="keywords"/>
                 <set field="contentId" from-field="parameters.contentId"/>

Modified: ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml Fri Jun 10 17:21:10 2016
@@ -149,7 +149,7 @@ under the License.
                 <set field="headerItem" value="ContentSetupMenu"/>
                 <set field="currentMenuItemName" to-scope="user" value="userpermission"/>
                 <set field="webSitePublishPoint" from-field="parameters.webSitePublishPoint" default-value="OFBIZDOCROOT"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/contentsetup/UserPermPrep.groovy"/>
+                <script location="component://content/groovyScripts/contentsetup/UserPermPrep.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Fri Jun 10 17:21:10 2016
@@ -180,7 +180,7 @@ under the License.
                 <set field="titleProperty" value="PageTitleEditDataResourceCategory"/>
                 <set field="headerItem" value="DataResourceSetupMenu"/>
                 <set field="tabButtonItem" to-scope="user" value="EditDataCategory"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/datasetup/DataCategoryPrep.groovy"/>
+                <script location="component://content/groovyScripts/datasetup/DataCategoryPrep.groovy"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>

Modified: ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml Fri Jun 10 17:21:10 2016
@@ -123,7 +123,7 @@ under the License.
                 <set field="tabButtonItem" to-scope="user" value="EditLayoutSubContent"/>
 
                 <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/>
+                <script location="component://content/groovyScripts/layout/EditSubContent.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
@@ -144,7 +144,7 @@ under the License.
                 <set field="tabButtonItem" to-scope="user" value="EditLayoutText"/>
 
                 <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/>
+                <script location="component://content/groovyScripts/layout/EditSubContent.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
@@ -165,7 +165,7 @@ under the License.
                 <set field="tabButtonItem" to-scope="user" value="EditLayoutHtml"/>
 
                 <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/>
+                <script location="component://content/groovyScripts/layout/EditSubContent.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
@@ -186,7 +186,7 @@ under the License.
                 <set field="tabButtonItem" to-scope="user" value="EditLayoutUrl"/>
 
                 <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/>
+                <script location="component://content/groovyScripts/layout/EditSubContent.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">
@@ -207,7 +207,7 @@ under the License.
                 <set field="tabButtonItem" to-scope="user" value="EditLayoutImage"/>
 
                 <entity-one entity-name="SubContentDataResourceView" value-field="currentValue"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy"/>
+                <script location="component://content/groovyScripts/layout/EditSubContent.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Fri Jun 10 17:21:10 2016
@@ -246,7 +246,7 @@ under the License.
                 <set field="titleProperty" value="OrderFindOrder"/>
                 <set field="headerItem" value="findorders"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/print/FindPrinters.groovy"/>
+                <script location="component://content/groovyScripts/print/FindPrinters.groovy"/>
 
                 <!-- asmslect parameters, must be prefixed by asm_ for SetMultipleSelectJs.ftl -->
                 <set field="asm_multipleSelectForm"  value="lookuporder"/>

Modified: ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/lucene/widget/LuceneScreens.xml Fri Jun 10 17:21:10 2016
@@ -59,7 +59,7 @@ under the License.
     <screen name="AdminSearch">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <script location="component://lucene/webapp/content/WEB-INF/actions/AdvancedSearchPrep.groovy"/>
                 <script location="component://lucene/webapp/content/WEB-INF/actions/Search.groovy"/>
                 <set field="titleProperty" value="ContentCMSSearchPage"/>
@@ -84,7 +84,7 @@ under the License.
     <screen name="ProductSearch">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <script location="component://lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy"/>
                 <set field="titleProperty" value="ContentCMSSearchPage"/>
                 <set field="currentCMSMenuItemName" value="productSearch" to-scope="user"/>
@@ -106,7 +106,7 @@ under the License.
     <screen name="AdminIndex">
         <section>
             <actions>
-                <script location="component://content/webapp/content/WEB-INF/actions/cms/GetMenuContext.groovy"/>
+                <script location="component://content/groovyScripts/cms/GetMenuContext.groovy"/>
                 <set field="titleProperty" value="ContentCMSSearchPage"/>
                 <set field="currentCMSMenuItemName" value="index" to-scope="user"/>
             </actions>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml?rev=1747756&r1=1747755&r2=1747756&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/SurveyScreens.xml Fri Jun 10 17:21:10 2016
@@ -45,7 +45,7 @@ under the License.
                 <set field="surveyId" from-field="parameters.surveyId"/>
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
                 <entity-one entity-name="Survey" value-field ="survey"/>
-                <script location="component://content/webapp/content/WEB-INF/actions/survey/ViewSurveyResponses.groovy"/>
+                <script location="component://content/groovyScripts/survey/ViewSurveyResponses.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}">