/[Apache-SVN]
ViewVC logotype

Revision 1635901


Jump to revision: Previous Next
Author: jacopoc
Date: Sat Nov 1 09:06:42 2014 UTC (9 years, 4 months ago)
Changed paths: 48
Log Message:
Merged json-integration-refactoring into trunk:
* moved the json-lib jar (json-lib-2.2.3-jdk15.jar) from the framework/webapp to the framework/base component
* removed the SQL select Parser.jj (parser definition) and its unit tests: it was not used (and never used) by any OFBiz code
* removed the JSON.jj (parser definition) and its unit tests: it was not used (and never used) by any OFBiz code apart from the JSON Converters (now migrated to json-lib, see next items in this list) some utility methods in UtilIO.java (that have been removed too because they have never been used in OFBiz) 
* removed the JavaCC jar and related ant scripts because no more needed after the removal of Parser.jj and JSON.jj
* converted the JSONConverter code that was based on JSON.jj to Jackson
* added a new class org.ofbiz.base.lang.JSON that have been contributed by Adrian Crum that is a facade for simplifying the client code and for hiding the specific JSON library being used
* removed an unused method: ImageManagementServices.toJsonObject(...)
* added TestBooleanConverters to the list of tests
* new unit tests for the new JSON converters
* refactored Ajax code in applications to use the common request json response rather than a custom method
* OFBIZ-5790 Implemented ability to call a service event by passing its input parameters in the request body as JSON data. These classes provide a simple mechanism, based on the request's content type, that can be extended to support other formats (e.g. XML).

This commit resolves OFBIZ-4572, OFBIZ-3365, OFBIZ-5751, OFBIZ-5790



Changed paths

Path Details
Directoryofbiz/trunk/ modified , props changed
Directoryofbiz/trunk/.classpath modified , text changed
Directoryofbiz/trunk/LICENSE modified , text changed
Directoryofbiz/trunk/NOTICE modified , text changed
Directoryofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java modified , text changed
Directoryofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml modified , text changed
Directoryofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl modified , text changed
Directoryofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java modified , props changed
Directoryofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java modified , text changed
Directoryofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java modified , text changed
Directoryofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreEvents.java modified , text changed
Directoryofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml modified , text changed
Directoryofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl modified , text changed
Directoryofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreGroupTree.ftl modified , text changed
Directoryofbiz/trunk/framework/base/ant-scripts/ofbiz-jjtree.groovy deleted
Directoryofbiz/trunk/framework/base/build.xml modified , text changed
Directoryofbiz/trunk/framework/base/lib/jackson-annotations-2.4.0.jar
(Copied from ofbiz/branches/json-integration-refactoring/framework/base/lib/jackson-annotations-2.4.0.jar, r1635900)
added
Directoryofbiz/trunk/framework/base/lib/jackson-core-2.4.2.jar
(Copied from ofbiz/branches/json-integration-refactoring/framework/base/lib/jackson-core-2.4.2.jar, r1635900)
added
Directoryofbiz/trunk/framework/base/lib/jackson-databind-2.4.2.jar
(Copied from ofbiz/branches/json-integration-refactoring/framework/base/lib/jackson-databind-2.4.2.jar, r1635900)
added
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/JSONConverters.java modified , text changed
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/JSONResult.java deleted
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java modified , text changed
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/test/TestJSONConverters.java
(Copied from ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/conversion/test/TestJSONConverters.java, r1635900)
added
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/json/ deleted
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/lang/JSON.java
(Copied from ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java, r1635900)
added
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilIO.java modified , text changed
Directoryofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java modified , text changed
Directoryofbiz/trunk/framework/base/testdef/basetests.xml modified , text changed
Directoryofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java modified , text changed
Directoryofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/SQLUtil.java deleted
Directoryofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java modified , text changed
Directoryofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/Converters.java modified , text changed
Directoryofbiz/trunk/framework/sql/build.xml modified , text changed
Directoryofbiz/trunk/framework/sql/src/org/ofbiz/sql/Main.java deleted
Directoryofbiz/trunk/framework/sql/src/org/ofbiz/sql/Parser.jj deleted
Directoryofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/SQLTest.java deleted
Directoryofbiz/trunk/framework/sql/src/org/ofbiz/sql/test/SelectTest.java modified , text changed
Directoryofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar deleted
Directoryofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONRequestBodyMapHandler.java
(Copied from ofbiz/branches/json-integration-refactoring/framework/webapp/src/org/ofbiz/webapp/event/JSONRequestBodyMapHandler.java, r1635900)
added
Directoryofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/RequestBodyMapHandler.java
(Copied from ofbiz/branches/json-integration-refactoring/framework/webapp/src/org/ofbiz/webapp/event/RequestBodyMapHandler.java, r1635900)
added
Directoryofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java
(Copied from ofbiz/branches/json-integration-refactoring/framework/webapp/src/org/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java, r1635900)
added
Directoryofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java modified , text changed
Directoryofbiz/trunk/lib/ deleted
Directoryofbiz/trunk/macros.xml modified , text changed
Directoryofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java modified , text changed
Directoryofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml modified , text changed
Directoryofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl modified , text changed
Directoryofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26