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 18:25:48 UTC
svn commit: r1747766 - in /ofbiz/trunk/applications/manufacturing:
groovyScripts/ webapp/manufacturing/WEB-INF/
webapp/manufacturing/WEB-INF/actions/ widget/manufacturing/
Author: deepak
Date: Fri Jun 10 18:25:48 2016
New Revision: 1747766
URL: http://svn.apache.org/viewvc?rev=1747766&view=rev
Log:
(OFBIZ-7225) relocate .groovy files in the manufacturing component
Added:
ofbiz/trunk/applications/manufacturing/groovyScripts/
- copied from r1747740, ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/
Removed:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1747766&r1=1747765&r2=1747766&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Jun 10 18:25:48 2016
@@ -451,7 +451,7 @@ under the License.
</request-map>
<request-map uri="ShowProductionRun">
<security https="true" auth="true"/>
- <event type="groovy" path="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ShowProductionRun.groovy"/>
+ <event type="groovy" path="component://manufacturing/groovyScripts/jobshopmgt/ShowProductionRun.groovy"/>
<response name="docs_not_printed" type="view" value="EditProductionRun"/>
<response name="docs_printed" type="view" value="ProductionRunDeclaration"/>
<response name="error" type="view" value="FindProductionRun"/>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=1747766&r1=1747765&r2=1747766&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Fri Jun 10 18:25:48 2016
@@ -52,7 +52,7 @@ under the License.
<set field="headerItem" value="bom"/>
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy"/>
+ <script location="component://manufacturing/groovyScripts/bom/EditProductBom.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonBomDecorator">
@@ -113,7 +113,7 @@ under the License.
<field-map from-field="productFeatureApplTypeId" field-name="productFeatureApplTypeId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/BomSimulation.groovy"/>
+ <script location="component://manufacturing/groovyScripts/bom/BomSimulation.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonBomDecorator">
@@ -136,7 +136,7 @@ under the License.
<set field="tabButtonItem" value="findBom"/>
<set field="labelTitleProperty" value="findBom"/>
<set field="headerItem" value="bom"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/bom/FindProductBom.groovy"/>
+ <script location="component://manufacturing/groovyScripts/bom/FindProductBom.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonBomDecorator">
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=1747766&r1=1747765&r2=1747766&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Fri Jun 10 18:25:48 2016
@@ -44,7 +44,7 @@ under the License.
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
<set field="headerItem" value="calendar"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy"/>
+ <script location="component://manufacturing/groovyScripts/routing/EditCalendar.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonCalendarDecorator">
@@ -144,7 +144,7 @@ under the License.
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
<set field="headerItem" value="calendar"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy"/>
+ <script location="component://manufacturing/groovyScripts/routing/EditCalendarExceptionWeek.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonCalendarDecorator">
@@ -169,7 +169,7 @@ under the License.
<!--<set field="labelTitleProperty" value="ProductProductBom"/>-->
<set field="headerItem" value="calendar"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy"/>
+ <script location="component://manufacturing/groovyScripts/routing/EditCalendarExceptionDay.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonCalendarDecorator">
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1747766&r1=1747765&r2=1747766&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Fri Jun 10 18:25:48 2016
@@ -87,8 +87,8 @@ under the License.
<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}"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/productionRunAllFixedAssets.groovy"/>
<set field="productionRunId" from-field="parameters.productionRunId"/>
<entity-one entity-name="WorkEffort" value-field="productionRun">
@@ -166,8 +166,8 @@ 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}"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunDeclaration.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/productionRunAllFixedAssets.groovy"/>
<set field="productionRunId" from-field="parameters.productionRunId" default-value="${parameters.workEffortId}"/>
<entity-one entity-name="WorkEffort" value-field="productionRun">
@@ -300,7 +300,7 @@ under the License.
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="ManufacturingProductionRun"/>
<set field="bodyFontSize" value="10pt"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunDeclaration.groovy"/>
</actions>
<widgets>
<decorator-screen name="SimpleDecorator" location="component://common/widget/CommonScreens.xml">
@@ -432,7 +432,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="productionRun">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-one>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunTaskParties.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunTaskParties.groovy"/>
</actions>
<widgets>
<screenlet>
@@ -459,7 +459,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="productionRunTask">
<field-map field-name="workEffortId" from-field="routingTaskId"/>
</entity-one>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunTasks.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunTasks.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
@@ -487,7 +487,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="productionRun">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-one>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunComponents.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
@@ -521,7 +521,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="productionRun">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-one>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunActualComponents.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
@@ -551,7 +551,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="productionRun">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-one>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunFixedAssets.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
@@ -582,7 +582,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="productionRun">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-one>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunCosts.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
@@ -610,7 +610,7 @@ under the License.
<entity-one entity-name="WorkEffort" value-field="productionRun">
<field-map field-name="workEffortId" from-field="productionRunId"/>
</entity-one>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunContent.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
@@ -700,7 +700,7 @@ under the License.
</condition-list>
<order-by field-name="${sortField}"/>
</entity-condition>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy"/>
+ <script location="component://manufacturing/groovyScripts/jobshopmgt/WorkWithShipmentPlans.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonManufacturingDecorator" location="${parameters.commonManufacturingDecoratorLocation}">
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=1747766&r1=1747765&r2=1747766&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Fri Jun 10 18:25:48 2016
@@ -95,7 +95,7 @@ under the License.
<order-by field-name="-finishDateTime"/>
<limit-range start="0" size="5"/>
</entity-condition>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy"/>
+ <script location="component://manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy"/>
</actions>
<widgets>
<decorator-screen name="CommonMrpDecorator">
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=1747766&r1=1747765&r2=1747766&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Fri Jun 10 18:25:48 2016
@@ -52,7 +52,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/CuttingListReport.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/CuttingListReport.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -76,7 +76,7 @@ under the License.
<set field="productCategoryIdPar" from-field="parameters.productCategoryIdPar"/>
<set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PRunsProductsByFeature.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -103,7 +103,7 @@ under the License.
<entity-one entity-name="Shipment" value-field="shipment"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PRunsProductsByFeature.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -128,7 +128,7 @@ under the License.
<set field="productCategoryIdPar" from-field="parameters.productCategoryIdPar"/>
<set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -156,7 +156,7 @@ under the License.
<entity-one entity-name="Shipment" value-field="shipment"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PRunsComponentsByFeature.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -182,7 +182,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PRunsProductsStacks.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -208,7 +208,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PackageContentsAndOrder.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -234,7 +234,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PRunsProductsAndOrder.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -259,7 +259,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/PRunsInfoAndOrder.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -278,7 +278,7 @@ under the License.
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/ShipmentPlanStockReport.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -299,7 +299,7 @@ under the License.
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/ShipmentLabel.groovy"/>
</actions>
<widgets>
<platform-specific>
@@ -319,7 +319,7 @@ under the License.
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy"/>
+ <script location="component://manufacturing/groovyScripts/reports/ShipmentWorkEffortTasks.groovy"/>
</actions>
<widgets>
<platform-specific>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1747766&r1=1747765&r2=1747766&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Fri Jun 10 18:25:48 2016
@@ -357,7 +357,7 @@ under the License.
<field-map from-field="workEffortGoodStdTypeId" field-name="workEffortGoodStdTypeId"/>
</entity-and>
<entity-one entity-name="WorkEffortGoodStandard" value-field="routingProductLink" auto-field-map="true"/>
- <!--<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditRoutingProductLink.groovy"/>-->
+ <!--<script location="component://manufacturing/groovyScripts/routing/EditRoutingProductLink.groovy"/>-->
</actions>
<widgets>
<decorator-screen name="CommonRoutingDecorator">