You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/10/19 15:22:20 UTC
svn commit: r1533758 - in /ofbiz/branches/release13.07: ./
applications/manufacturing/documents/
applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/
applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/
framework/web...
Author: jleroux
Date: Sat Oct 19 13:22:19 2013
New Revision: 1533758
URL: http://svn.apache.org/r1533758
Log:
"Applied fix from trunk for revision: 1532366"
------------------------------------------------------------------------
r1532366 | jleroux | 2013-10-15 16:51:57 +0200 (mar. 15 oct. 2013) | 5 lignes
A slightly modified patch from Gareth Carter for "Fixes for some xml/groovy files" https://issues.apache.org/jira/browse/OFBIZ-5349
Validated all xml files and compiled all groovy files and found a few errors. Look at patch for details
jleroux: For webapptests.xml, I prefered to revert it from r959261 (I saw an issue in my xml editor, did not check more)
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/manufacturing/documents/manufacturing.xml
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy
ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
ofbiz/branches/release13.07/framework/webapp/testdef/webapptests.xml
ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1532366
Modified: ofbiz/branches/release13.07/applications/manufacturing/documents/manufacturing.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/documents/manufacturing.xml?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/documents/manufacturing.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/documents/manufacturing.xml Sat Oct 19 13:22:19 2013
@@ -35,5 +35,4 @@
<xi:include href="../data/helpdata/Help_MFG_FindInventoryEventPlan.xml"/>
<xi:include href="../data/helpdata/Help_MFG_WorkWithShipmentPlans.xml"/>
<xi:include href="../data/helpdata/Help_MFG_ManufacturingReports.xml"/>
- <
</chapter>
\ No newline at end of file
Modified: ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy Sat Oct 19 13:22:19 2013
@@ -47,7 +47,7 @@ if (allProductionRuns) {
productionRunTask = EntityUtil.getFirst(productionRunTasks);
if (!productionRunTask) {
// the production run doesn't include the given task, skip it
- continue;
+ return;
}
// select the task's components, if any
@@ -57,7 +57,7 @@ if (allProductionRuns) {
if (productCategoryIdPar) {
if (!isProductInCategory(delegator, productionRunComponent.productId, productCategoryIdPar)) {
// the production run's product is not a member of the given category, skip it
- continue;
+ return;
}
}
productionRunProduct = delegator.findOne("Product", [productId : productionRunComponent.productId], false);
Modified: ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy Sat Oct 19 13:22:19 2013
@@ -38,7 +38,7 @@ if (allProductionRuns) {
if (productCategoryIdPar) {
if (!isProductInCategory(delegator, productionRun.productId, productCategoryIdPar)) {
// the production run's product is not a member of the given category, skip it
- continue;
+ return;
}
}
productionRunProduct = delegator.findOne("Product", [productId : productionRun.productId], false);
@@ -53,7 +53,7 @@ if (allProductionRuns) {
productionRunTask = EntityUtil.getFirst(productionRunTasks);
if (!productionRunTask) {
// the production run doesn't include the given task, skip it
- continue;
+ return;
}
productionRunMap = [productionRun : productionRun,
Modified: ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy Sat Oct 19 13:22:19 2013
@@ -38,7 +38,7 @@ if (allProductionRuns) {
if (productCategoryIdPar) {
if (!isProductInCategory(delegator, productionRun.productId, productCategoryIdPar)) {
// the production run's product is not a member of the given category, skip it
- continue;
+ return;
}
}
productionRunProduct = delegator.findOne("Product", [productId : productionRun.productId], false);
Modified: ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy Sat Oct 19 13:22:19 2013
@@ -44,7 +44,7 @@ if (allProductionRuns) {
if (productCategoryIdPar) {
if (!isProductInCategory(delegator, productionRun.productId, productCategoryIdPar)) {
// the production run's product is not a member of the given category, skip it
- continue;
+ return;
}
}
productionRunProduct = delegator.findOne("Product", [productId : productionRun.productId], false);
@@ -70,7 +70,7 @@ if (allProductionRuns) {
productionRunTask = EntityUtil.getFirst(productionRunTasks);
if (!productionRunTask) {
// the production run doesn't include the given task, skip it
- continue;
+ return;
}
productionRunMap = [productionRun : productionRun,
Modified: ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy Sat Oct 19 13:22:19 2013
@@ -42,7 +42,7 @@ if (allProductionRuns) {
if (productCategoryIdPar) {
if (!isProductInCategory(delegator, productionRun.productId, productCategoryIdPar)) {
// the production run's product is not a member of the given category, skip it
- continue;
+ return;
}
}
productionRunProduct = delegator.findOne("Product", [productId : productionRun.productId], false);
@@ -57,7 +57,7 @@ if (allProductionRuns) {
productionRunTask = EntityUtil.getFirst(productionRunTasks);
if (!productionRunTask) {
// the production run doesn't include the given task, skip it
- continue;
+ return;
}
}
Modified: ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy Sat Oct 19 13:22:19 2013
@@ -45,7 +45,7 @@ if (packageContents) {
if (productCategoryIdPar) {
if (!isProductInCategory(delegator, product.productId, productCategoryIdPar)) {
// the production run's product is not a member of the given category, skip it
- continue;
+ return;
}
}
Modified: ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy (original)
+++ ofbiz/branches/release13.07/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy Sat Oct 19 13:22:19 2013
@@ -109,7 +109,7 @@ if (fileType) {
if (checkPathFile.equals(productContentList.get(0).drObjectInfo)) {
BufferedImage bufImg = ImageIO.read(new File(imageManagementPath + "/" + productId + "/" + dataResourceName));
} else {
- BufferedImage bufImg = ImageIO.read(new File(productContentList.get(0).drObjectInfo)));
+ BufferedImage bufImg = ImageIO.read(new File(productContentList.get(0).drObjectInfo));
}
ImageIO.write((RenderedImage) bufImg, "jpg", new File(imageManagementPath + "/" + productId + "/" + defaultFileName));
Modified: ofbiz/branches/release13.07/framework/webapp/testdef/webapptests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/testdef/webapptests.xml?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/webapp/testdef/webapptests.xml (original)
+++ ofbiz/branches/release13.07/framework/webapp/testdef/webapptests.xml Sat Oct 19 13:22:19 2013
@@ -17,8 +17,11 @@
under the License.
-->
-<!--<test-suite suite-name="webapptests"-->
-<!-- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"-->
-<!-- xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">-->
-<!---->
-<!--</test-suite>-->
+<test-suite suite-name="webapptests"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+
+ <test-case case-name="webapp-tests">
+ <junit-test-suite class-name="org.ofbiz.webapp.test.XmlRpcTests"/>
+ </test-case>
+</test-suite>
Modified: ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy?rev=1533758&r1=1533757&r2=1533758&view=diff
==============================================================================
--- ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy (original)
+++ ofbiz/branches/release13.07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy Sat Oct 19 13:22:19 2013
@@ -95,7 +95,7 @@ if (!"granted".equals(permissionStatus))
request.setAttribute("permissionErrorMsg", errorMessage);
context.permissionErrorMsg = errorMessage;
context.hasPermission = false;
- request.setAttribute("hasPermission", false;
+ request.setAttribute("hasPermission", false);
request.setAttribute("permissionStatus", "");
return;
} else {