Skip to content

Commit daa1e61

Browse files
committed
Reverted: JSON entity data import and export utility
(OFBIZ-10966) Implementation was not matching OFBiz code quality requirements. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867342 13f79535-47bb-0310-9956-ffa450edef68
1 parent a86beec commit daa1e61

File tree

18 files changed

+1
-2281
lines changed

18 files changed

+1
-2281
lines changed

applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml

-12
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,6 @@
5858
<response name="success" type="view" value="EntityExportAll"/>
5959
<response name="error" type="view" value="EntityExportAll"/>
6060
</request-map>
61-
<request-map uri="EntityExportAllJson">
62-
<security https="true" auth="true"/>
63-
<response name="success" type="view" value="EntityExportAllJson"/>
64-
<response name="error" type="view" value="EntityExportAllJson"/>
65-
</request-map>
66-
<request-map uri="entityExportAllJson">
67-
<security https="true" auth="true"/>
68-
<event type="service" path="" invoke="entityExportAllJson"/>
69-
<response name="success" type="view" value="EntityExportAllJson"/>
70-
<response name="error" type="view" value="EntityExportAllJson"/>
71-
</request-map>
7261

7362
<!-- ================ Product Store Requests ============= -->
7463
<request-map uri="FindProductStore">
@@ -217,7 +206,6 @@
217206
<view-map name="EditProductStore" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#EditProductStore"/>
218207

219208
<view-map name="EntityExportAll" type="screen" page="component://commonext/widget/ofbizsetup/CommonScreens.xml#EntityExportAll"/>
220-
<view-map name="EntityExportAllJson" type="screen" page="component://commonext/widget/ofbizsetup/CommonScreens.xml#EntityExportAllJson"/>
221209

222210
<view-map name="FindWebSite" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#FindWebSite"/>
223211
<view-map name="EditWebSite" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#EditWebSite"/>

applications/commonext/widget/ofbizsetup/CommonScreens.xml

-22
Original file line numberDiff line numberDiff line change
@@ -153,26 +153,4 @@
153153
</widgets>
154154
</section>
155155
</screen>
156-
<screen name="EntityExportAllJson">
157-
<section>
158-
<actions>
159-
<set field="titleProperty" value="PageTitleEntityExportAllJson"/>
160-
<set field="tabButtonItem" value="entityExportAllJson"/>
161-
<set field="parameters.TRANSACTION_TIMEOUT" value="7200"/>
162-
<set field="results" from-field="parameters.results"/>
163-
<set field="headerItem" value="export"/>
164-
</actions>
165-
<widgets>
166-
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
167-
<decorator-section name="body">
168-
<screenlet title="${uiLabelMap.PageTitleEntityExportAllJson}">
169-
<platform-specific>
170-
<html><html-template location="component://webtools/template/entity/EntityExportAllJson.ftl"/></html>
171-
</platform-specific>
172-
</screenlet>
173-
</decorator-section>
174-
</decorator-screen>
175-
</widgets>
176-
</section>
177-
</screen>
178156
</screens>

build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ dependencies {
202202
implementation 'wsdl4j:wsdl4j:1.6.3'
203203
implementation 'org.jsoup:jsoup:1.12.1'
204204
implementation 'com.auth0:java-jwt:3.8.2'
205-
implementation 'org.json:json:20140107'
206205
testImplementation 'org.hamcrest:hamcrest:2.1'
207206
testImplementation 'org.hamcrest:hamcrest-library:2.1' // Enable junit4 to not depend on hamcrest-1.3
208207
testImplementation 'org.mockito:mockito-core:3.0.0'

0 commit comments

Comments
 (0)