svn commit: r1635399 [8/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=163

svn commit: r1635399 [6/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=1635399&r1=1635

svn propchange: r1635399 - svn:log

Author: jacopoc Revision: 1635399 Modified property: svn:log Modified: svn:log at Thu Oct 30 06:13:19 2014 -- --- svn:log (original) +++ svn:log Thu Oct 30 06:13:19 2014 @@ -1 +1 @@ -Merged branch with trunk. +Synched bran

svn commit: r1635399 [7/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1635399&r1=1635398&r2=1635399&view=

svn commit: r1635399 [5/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/applications/party/src/org/ofbiz/party/party/PartyWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=1635399&r1=1635398&r2=1635399&view=di

svn commit: r1635399 [1/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Author: jacopoc Date: Thu Oct 30 06:10:58 2014 New Revision: 1635399 URL: http://svn.apache.org/r1635399 Log: Merged branch with trunk. Modified: ofbiz/branches/json-integration-refactoring/ (props changed) ofbiz/branches/json-integration-refactoring/applications/content/data/DemoBlogP

svn commit: r1635399 [9/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1635399&r1=1635398&r2=1635399&view=diff ===

svn commit: r1635399 [4/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1635399&r1=163539

svn commit: r1635399 [2/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/Produc

svn commit: r1635399 [3/9] - in /ofbiz/branches/json-integration-refactoring: ./ applications/content/data/ applications/manufacturing/src/org/ofbiz/manufacturing/bom/ applications/manufacturing/src/o

Modified: ofbiz/branches/json-integration-refactoring/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java?rev=1635399&r1=1635398&r2=163

svn commit: r1635383 [5/6] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/quote/ applications/order/src/org/ofbiz/order/requirement/ applicatio

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1635383&r1=1635382&r2=1635383&view=diff =

svn commit: r1635383 [6/6] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/quote/ applications/order/src/org/ofbiz/order/requirement/ applicatio

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=1635383&r1=1635382&r2=1635383&view=diff =

svn commit: r1635383 [4/6] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/quote/ applications/order/src/org/ofbiz/order/requirement/ applicatio

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1635383&r1=1635382&r2=1635383&view=diff =

svn commit: r1635383 [2/6] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/quote/ applications/order/src/org/ofbiz/order/requirement/ applicatio

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1635383&r1=1635382&r2=1635383&view=diff =

svn commit: r1635383 [1/6] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/quote/ applications/order/src/org/ofbiz/order/requirement/ applicatio

Author: lektran Date: Thu Oct 30 04:18:05 2014 New Revision: 1635383 URL: http://svn.apache.org/r1635383 Log: Regex search/replace for delegator.findOne() to EntityQuery.queryOne() Apologies for the large commit. Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderRetur

svn commit: r1635383 [3/6] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/quote/ applications/order/src/org/ofbiz/order/requirement/ applicatio

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java?rev=1635383&r1=1635382&r2=1635383&view=diff ===

svn commit: r1635382 - in /ofbiz/trunk/applications/order/src/org/ofbiz/order: ./ finaccount/ order/

Author: lektran Date: Thu Oct 30 04:16:45 2014 New Revision: 1635382 URL: http://svn.apache.org/r1635382 Log: Partially convert ordermgr component's java files to EntityQuery Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java ofbiz/trunk/applications/ord

svn commit: r1635381 - in /ofbiz/trunk/applications/marketing/src/org/ofbiz: marketing/marketing/MarketingServices.java marketing/tracking/TrackingCodeEvents.java sfa/vcard/VCard.java

Author: lektran Date: Thu Oct 30 04:16:39 2014 New Revision: 1635381 URL: http://svn.apache.org/r1635381 Log: Convert marketing component's java files to EntityQuery Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java ofbiz/trunk/applica

svn commit: r1635380 [2/2] - in /ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing: bom/ jobshopmgt/ mrp/ routing/ techdata/

Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1635380&r1=1635379&r2=1635380&view=diff =

svn commit: r1635380 [1/2] - in /ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing: bom/ jobshopmgt/ mrp/ routing/ techdata/

Author: lektran Date: Thu Oct 30 04:16:33 2014 New Revision: 1635380 URL: http://svn.apache.org/r1635380 Log: Convert manufacturing app's java files to EntityQuery Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java ofbiz/trunk/applications/ma

svn commit: r1635232 - in /ofbiz/trunk: applications/content/data/ specialpurpose/cmssite/data/ specialpurpose/cmssite/template/cms/ specialpurpose/ecommerce/data/ specialpurpose/ecommerce/script/org/

Author: jacopoc Date: Wed Oct 29 18:02:51 2014 New Revision: 1635232 URL: http://svn.apache.org/r1635232 Log: Fixes for the "Did you know?" screenlet in ecommerce that was throwing errors after Scott's recent fix to a content related method (the fix has exposed the data issues). Modified: o

svn commit: r1635219 - /ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml

Author: jleroux Date: Wed Oct 29 17:34:07 2014 New Revision: 1635219 URL: http://svn.apache.org/r1635219 Log: At r1635192, I forgot to remove the Minilang implementation of countProductQuantityOrdered Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductService

svn commit: r1635192 - in /ofbiz/trunk/applications: order/servicedef/services.xml order/src/org/ofbiz/order/order/OrderServices.java order/src/org/ofbiz/order/test/SalesOrderTest.java product/service

Author: jleroux Date: Wed Oct 29 16:37:40 2014 New Revision: 1635192 URL: http://svn.apache.org/r1635192 Log: The storeOrder service, implemented by the OrderService.createOrder() method, synchronously calls the countProductQuantityOrdered service implemented in Minilang. OOTB, the countProductQ