[ofbiz-plugins] branch trunk updated (c6704e9 -> 66055a7)
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git. from c6704e9 Fixed: Error message is displayed when user clicks on create link after the user quick chechout and user is not logged in (OFBIZ-12188) Added missing UtilHttp class import statement Thanks: Arpit Mor for reporting the issue and Sourabh Punyani for providing the fix. new 107b26b Improved: Remove ofbiz prefix from files and folders (OFBIZ-12197) new 1a6e4f8 Improved: Removes "ofbiz" prefix from files and folders, code cleanup (OFBIZ-12197) new b5c6a17 Improved: Corrects asciidoc levels and follows one-sentence-per-line rule (OFBIZ-12197) new 84d7053 Improved: Fixes html bugs spotted by sonarcloud (OFBIZ-12197) new 66055a7 Improved: Fixes sonarcloud error by using the resource integrity feature for embedding external redoc javascript file (OFBIZ-12197) The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ofbiz-rest-impl/data/Ofbiz-rest-jerseyDemoData.xml | 23 ------- .../Ofbiz-rest-jerseySecurityGroupDemoData.xml | 36 ----------- ...Ofbiz-rest-jerseySecurityPermissionSeedData.xml | 35 ---------- ofbiz-rest-impl/data/Ofbiz-rest-jerseyTypeData.xml | 23 ------- ofbiz-rest-impl/entitydef/entitymodel.xml | 31 --------- .../ofbiz-rest-jersey/WEB-INF/controller.xml | 47 -------------- ofbiz-rest-impl/webapp/ofbiz-rest-jersey/index.jsp | 20 ------ ofbiz-rest-impl/widget/CommonScreens.xml | 71 --------------------- ofbiz-rest-impl/widget/Ofbiz-rest-jerseyForms.xml | 26 -------- ofbiz-rest-impl/widget/Ofbiz-rest-jerseyMenus.xml | 29 --------- .../widget/Ofbiz-rest-jerseyScreens.xml | 40 ------------ {ofbiz-rest-impl => rest-api}/README.adoc | 20 +++--- {ofbiz-rest-impl => rest-api}/build.gradle | 0 .../config/ApiUiLabels.xml | 20 ------ {ofbiz-rest-impl => rest-api}/dtd/rest-api.xsd | 0 {ofbiz-rest-impl => rest-api}/ofbiz-component.xml | 27 ++------ .../servicedef/services.xml | 2 +- .../org/apache/ofbiz/ws/rs/ApiServiceRequest.java | 0 .../org/apache/ofbiz/ws/rs/ConflictException.java | 0 .../ofbiz/ws/rs/MethodNotAllowedException.java | 0 .../ofbiz/ws/rs/ServiceNotFoundException.java | 0 .../apache/ofbiz/ws/rs/ServiceRequestFilter.java | 0 .../ofbiz/ws/rs/ServiceRequestProcessor.java | 0 .../ws/rs/annotation/ServiceRequestValidator.java | 0 .../ofbiz/ws/rs/common/AuthenticationScheme.java | 0 .../apache/ofbiz/ws/rs/core/OFBizApiConfig.java | 0 .../apache/ofbiz/ws/rs/core/ResponseStatus.java | 0 .../ofbiz/ws/rs/listener/ApiContextListener.java | 0 .../org/apache/ofbiz/ws/rs/model/ModelApi.java | 0 .../apache/ofbiz/ws/rs/model/ModelApiReader.java | 0 .../apache/ofbiz/ws/rs/model/ModelOperation.java | 0 .../apache/ofbiz/ws/rs/model/ModelResource.java | 0 .../ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 0 .../ofbiz/ws/rs/openapi/OFBizResourceScanner.java | 0 .../ofbiz/ws/rs/process/RestRequestHandler.java | 0 .../ofbiz/ws/rs/process/ServiceRequestHandler.java | 0 .../ofbiz/ws/rs/resources/ApiRootResource.java | 0 .../ws/rs/resources/AuthenticationResource.java | 0 .../ofbiz/ws/rs/resources/IOFBizResource.java | 0 .../ofbiz/ws/rs/resources/OFBizResource.java | 0 .../ws/rs/resources/OFBizServiceResource.java | 0 .../ofbiz/ws/rs/resources/OpenApiResource.java | 0 .../org/apache/ofbiz/ws/rs/response/Error.java | 0 .../org/apache/ofbiz/ws/rs/response/Messages.java | 0 .../org/apache/ofbiz/ws/rs/response/Response.java | 0 .../org/apache/ofbiz/ws/rs/response/Success.java | 0 .../org/apache/ofbiz/ws/rs/security/AuthToken.java | 0 .../org/apache/ofbiz/ws/rs/security/Secured.java | 0 .../ofbiz/ws/rs/security/auth/APIAuthFilter.java | 0 .../ws/rs/security/auth/HttpBasicAuthFilter.java | 0 .../apache/ofbiz/ws/rs/services/RestServices.java | 0 .../ofbiz/ws/rs/spi/AbstractExceptionMapper.java | 0 .../rs/spi/impl/GenericServiceExceptionMapper.java | 0 .../ws/rs/spi/impl/GlobalExceptionMapper.java | 0 .../apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java | 0 .../spi/impl/JsonifiedParamConverterProvider.java | 0 .../ofbiz/ws/rs/spi/impl/LinkSerializer.java | 0 .../org/apache/ofbiz/ws/rs/util/ErrorUtil.java | 0 .../org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 0 .../org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 0 .../testdef/rest-apiTests.xml | 2 +- .../webapp/docs/WEB-INF/web.xml | 0 .../webapp/docs/favicon-16x16.png | Bin .../webapp/docs/favicon-32x32.png | Bin .../webapp/docs/oauth2-redirect.html | 4 +- .../webapp/docs/redoc.html | 4 +- .../webapp/docs/swagger-ui-bundle.js | 0 .../webapp/docs/swagger-ui-bundle.js.map | 0 .../webapp/docs/swagger-ui-es-bundle-core.js | 0 .../webapp/docs/swagger-ui-es-bundle-core.js.map | 0 .../webapp/docs/swagger-ui-es-bundle.js | 0 .../webapp/docs/swagger-ui-es-bundle.js.map | 0 .../webapp/docs/swagger-ui-standalone-preset.js | 0 .../docs/swagger-ui-standalone-preset.js.map | 0 .../webapp/docs/swagger-ui.css | 0 .../webapp/docs/swagger-ui.css.map | 0 .../webapp/docs/swagger-ui.html | 0 .../webapp/docs/swagger-ui.js | 0 .../webapp/docs/swagger-ui.js.map | 0 .../webapp/rest-api}/WEB-INF/web.xml | 11 +--- 80 files changed, 27 insertions(+), 444 deletions(-) delete mode 100644 ofbiz-rest-impl/data/Ofbiz-rest-jerseyDemoData.xml delete mode 100644 ofbiz-rest-impl/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml delete mode 100644 ofbiz-rest-impl/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml delete mode 100644 ofbiz-rest-impl/data/Ofbiz-rest-jerseyTypeData.xml delete mode 100644 ofbiz-rest-impl/entitydef/entitymodel.xml delete mode 100644 ofbiz-rest-impl/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml delete mode 100644 ofbiz-rest-impl/webapp/ofbiz-rest-jersey/index.jsp delete mode 100644 ofbiz-rest-impl/widget/CommonScreens.xml delete mode 100644 ofbiz-rest-impl/widget/Ofbiz-rest-jerseyForms.xml delete mode 100644 ofbiz-rest-impl/widget/Ofbiz-rest-jerseyMenus.xml delete mode 100644 ofbiz-rest-impl/widget/Ofbiz-rest-jerseyScreens.xml rename {ofbiz-rest-impl => rest-api}/README.adoc (92%) rename {ofbiz-rest-impl => rest-api}/build.gradle (100%) rename {ofbiz-rest-impl => rest-api}/config/ApiUiLabels.xml (63%) rename {ofbiz-rest-impl => rest-api}/dtd/rest-api.xsd (100%) rename {ofbiz-rest-impl => rest-api}/ofbiz-component.xml (57%) rename {ofbiz-rest-impl => rest-api}/servicedef/services.xml (96%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/ApiServiceRequest.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/response/Messages.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/response/Response.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java (100%) rename {ofbiz-rest-impl => rest-api}/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java (100%) rename ofbiz-rest-impl/testdef/Ofbiz-rest-jerseyTests.xml => rest-api/testdef/rest-apiTests.xml (94%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/WEB-INF/web.xml (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/favicon-16x16.png (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/favicon-32x32.png (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/oauth2-redirect.html (97%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/redoc.html (88%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-bundle.js (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-bundle.js.map (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-es-bundle-core.js (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-es-bundle-core.js.map (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-es-bundle.js (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-es-bundle.js.map (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-standalone-preset.js (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui-standalone-preset.js.map (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.css (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.css.map (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.html (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.js (100%) rename {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.js.map (100%) rename {ofbiz-rest-impl/webapp/ofbiz-rest-jersey => rest-api/webapp/rest-api}/WEB-INF/web.xml (81%) |
|
|
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 107b26b66c0a594994bb32d122976622673ef5ce Author: Michael Brohl <[hidden email]> AuthorDate: Mon Mar 15 22:38:30 2021 +0100 Improved: Remove ofbiz prefix from files and folders (OFBIZ-12197) Renames ofbiz-rest-impl to rest-api. --- {ofbiz-rest-impl => rest-api}/README.adoc | 0 {ofbiz-rest-impl => rest-api}/build.gradle | 0 {ofbiz-rest-impl => rest-api}/config/ApiUiLabels.xml | 0 .../data/Ofbiz-rest-jerseyDemoData.xml | 0 .../data/Ofbiz-rest-jerseySecurityGroupDemoData.xml | 0 .../data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml | 0 .../data/Ofbiz-rest-jerseyTypeData.xml | 0 {ofbiz-rest-impl => rest-api}/dtd/rest-api.xsd | 0 {ofbiz-rest-impl => rest-api}/entitydef/entitymodel.xml | 0 {ofbiz-rest-impl => rest-api}/ofbiz-component.xml | 0 {ofbiz-rest-impl => rest-api}/servicedef/services.xml | 0 .../main/java/org/apache/ofbiz/ws/rs/ApiServiceRequest.java | 0 .../main/java/org/apache/ofbiz/ws/rs/ConflictException.java | 0 .../org/apache/ofbiz/ws/rs/MethodNotAllowedException.java | 0 .../org/apache/ofbiz/ws/rs/ServiceNotFoundException.java | 0 .../java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java | 0 .../org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java | 0 .../ofbiz/ws/rs/annotation/ServiceRequestValidator.java | 0 .../org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java | 0 .../java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java | 0 .../java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java | 0 .../org/apache/ofbiz/ws/rs/listener/ApiContextListener.java | 0 .../main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java | 0 .../java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java | 0 .../java/org/apache/ofbiz/ws/rs/model/ModelOperation.java | 0 .../java/org/apache/ofbiz/ws/rs/model/ModelResource.java | 0 .../org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 0 .../apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java | 0 .../org/apache/ofbiz/ws/rs/process/RestRequestHandler.java | 0 .../apache/ofbiz/ws/rs/process/ServiceRequestHandler.java | 0 .../org/apache/ofbiz/ws/rs/resources/ApiRootResource.java | 0 .../ofbiz/ws/rs/resources/AuthenticationResource.java | 0 .../org/apache/ofbiz/ws/rs/resources/IOFBizResource.java | 0 .../org/apache/ofbiz/ws/rs/resources/OFBizResource.java | 0 .../apache/ofbiz/ws/rs/resources/OFBizServiceResource.java | 0 .../org/apache/ofbiz/ws/rs/resources/OpenApiResource.java | 0 .../main/java/org/apache/ofbiz/ws/rs/response/Error.java | 0 .../main/java/org/apache/ofbiz/ws/rs/response/Messages.java | 0 .../main/java/org/apache/ofbiz/ws/rs/response/Response.java | 0 .../main/java/org/apache/ofbiz/ws/rs/response/Success.java | 0 .../java/org/apache/ofbiz/ws/rs/security/AuthToken.java | 0 .../main/java/org/apache/ofbiz/ws/rs/security/Secured.java | 0 .../org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java | 0 .../ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java | 0 .../java/org/apache/ofbiz/ws/rs/services/RestServices.java | 0 .../org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java | 0 .../ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java | 0 .../apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java | 0 .../java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java | 0 .../ws/rs/spi/impl/JsonifiedParamConverterProvider.java | 0 .../org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java | 0 .../main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java | 0 .../main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 0 .../main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 0 .../testdef/Ofbiz-rest-jerseyTests.xml | 0 {ofbiz-rest-impl => rest-api}/webapp/docs/WEB-INF/web.xml | 0 {ofbiz-rest-impl => rest-api}/webapp/docs/favicon-16x16.png | Bin {ofbiz-rest-impl => rest-api}/webapp/docs/favicon-32x32.png | Bin .../webapp/docs/oauth2-redirect.html | 0 {ofbiz-rest-impl => rest-api}/webapp/docs/redoc.html | 0 .../webapp/docs/swagger-ui-bundle.js | 0 .../webapp/docs/swagger-ui-bundle.js.map | 0 .../webapp/docs/swagger-ui-es-bundle-core.js | 0 .../webapp/docs/swagger-ui-es-bundle-core.js.map | 0 .../webapp/docs/swagger-ui-es-bundle.js | 0 .../webapp/docs/swagger-ui-es-bundle.js.map | 0 .../webapp/docs/swagger-ui-standalone-preset.js | 0 .../webapp/docs/swagger-ui-standalone-preset.js.map | 0 {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.css | 0 .../webapp/docs/swagger-ui.css.map | 0 {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.html | 0 {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.js | 0 {ofbiz-rest-impl => rest-api}/webapp/docs/swagger-ui.js.map | 0 .../webapp/ofbiz-rest-jersey/WEB-INF/controller.xml | 0 .../webapp/ofbiz-rest-jersey/WEB-INF/web.xml | 0 .../webapp/ofbiz-rest-jersey/index.jsp | 0 {ofbiz-rest-impl => rest-api}/widget/CommonScreens.xml | 0 .../widget/Ofbiz-rest-jerseyForms.xml | 0 .../widget/Ofbiz-rest-jerseyMenus.xml | 0 .../widget/Ofbiz-rest-jerseyScreens.xml | 0 80 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ofbiz-rest-impl/README.adoc b/rest-api/README.adoc similarity index 100% rename from ofbiz-rest-impl/README.adoc rename to rest-api/README.adoc diff --git a/ofbiz-rest-impl/build.gradle b/rest-api/build.gradle similarity index 100% rename from ofbiz-rest-impl/build.gradle rename to rest-api/build.gradle diff --git a/ofbiz-rest-impl/config/ApiUiLabels.xml b/rest-api/config/ApiUiLabels.xml similarity index 100% rename from ofbiz-rest-impl/config/ApiUiLabels.xml rename to rest-api/config/ApiUiLabels.xml diff --git a/ofbiz-rest-impl/data/Ofbiz-rest-jerseyDemoData.xml b/rest-api/data/Ofbiz-rest-jerseyDemoData.xml similarity index 100% rename from ofbiz-rest-impl/data/Ofbiz-rest-jerseyDemoData.xml rename to rest-api/data/Ofbiz-rest-jerseyDemoData.xml diff --git a/ofbiz-rest-impl/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml b/rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml similarity index 100% rename from ofbiz-rest-impl/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml rename to rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml diff --git a/ofbiz-rest-impl/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml b/rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml similarity index 100% rename from ofbiz-rest-impl/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml rename to rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml diff --git a/ofbiz-rest-impl/data/Ofbiz-rest-jerseyTypeData.xml b/rest-api/data/Ofbiz-rest-jerseyTypeData.xml similarity index 100% rename from ofbiz-rest-impl/data/Ofbiz-rest-jerseyTypeData.xml rename to rest-api/data/Ofbiz-rest-jerseyTypeData.xml diff --git a/ofbiz-rest-impl/dtd/rest-api.xsd b/rest-api/dtd/rest-api.xsd similarity index 100% rename from ofbiz-rest-impl/dtd/rest-api.xsd rename to rest-api/dtd/rest-api.xsd diff --git a/ofbiz-rest-impl/entitydef/entitymodel.xml b/rest-api/entitydef/entitymodel.xml similarity index 100% rename from ofbiz-rest-impl/entitydef/entitymodel.xml rename to rest-api/entitydef/entitymodel.xml diff --git a/ofbiz-rest-impl/ofbiz-component.xml b/rest-api/ofbiz-component.xml similarity index 100% rename from ofbiz-rest-impl/ofbiz-component.xml rename to rest-api/ofbiz-component.xml diff --git a/ofbiz-rest-impl/servicedef/services.xml b/rest-api/servicedef/services.xml similarity index 100% rename from ofbiz-rest-impl/servicedef/services.xml rename to rest-api/servicedef/services.xml diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ApiServiceRequest.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ApiServiceRequest.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ApiServiceRequest.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/ApiServiceRequest.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/listener/ApiContextListener.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelOperation.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/model/ModelResource.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Error.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Messages.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Messages.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Messages.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Messages.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Response.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Response.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Response.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Response.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/response/Success.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/services/RestServices.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java diff --git a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java similarity index 100% rename from ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java rename to rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java diff --git a/ofbiz-rest-impl/testdef/Ofbiz-rest-jerseyTests.xml b/rest-api/testdef/Ofbiz-rest-jerseyTests.xml similarity index 100% rename from ofbiz-rest-impl/testdef/Ofbiz-rest-jerseyTests.xml rename to rest-api/testdef/Ofbiz-rest-jerseyTests.xml diff --git a/ofbiz-rest-impl/webapp/docs/WEB-INF/web.xml b/rest-api/webapp/docs/WEB-INF/web.xml similarity index 100% rename from ofbiz-rest-impl/webapp/docs/WEB-INF/web.xml rename to rest-api/webapp/docs/WEB-INF/web.xml diff --git a/ofbiz-rest-impl/webapp/docs/favicon-16x16.png b/rest-api/webapp/docs/favicon-16x16.png similarity index 100% rename from ofbiz-rest-impl/webapp/docs/favicon-16x16.png rename to rest-api/webapp/docs/favicon-16x16.png diff --git a/ofbiz-rest-impl/webapp/docs/favicon-32x32.png b/rest-api/webapp/docs/favicon-32x32.png similarity index 100% rename from ofbiz-rest-impl/webapp/docs/favicon-32x32.png rename to rest-api/webapp/docs/favicon-32x32.png diff --git a/ofbiz-rest-impl/webapp/docs/oauth2-redirect.html b/rest-api/webapp/docs/oauth2-redirect.html similarity index 100% rename from ofbiz-rest-impl/webapp/docs/oauth2-redirect.html rename to rest-api/webapp/docs/oauth2-redirect.html diff --git a/ofbiz-rest-impl/webapp/docs/redoc.html b/rest-api/webapp/docs/redoc.html similarity index 100% rename from ofbiz-rest-impl/webapp/docs/redoc.html rename to rest-api/webapp/docs/redoc.html diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-bundle.js b/rest-api/webapp/docs/swagger-ui-bundle.js similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-bundle.js rename to rest-api/webapp/docs/swagger-ui-bundle.js diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-bundle.js.map b/rest-api/webapp/docs/swagger-ui-bundle.js.map similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-bundle.js.map rename to rest-api/webapp/docs/swagger-ui-bundle.js.map diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle-core.js b/rest-api/webapp/docs/swagger-ui-es-bundle-core.js similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle-core.js rename to rest-api/webapp/docs/swagger-ui-es-bundle-core.js diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle-core.js.map b/rest-api/webapp/docs/swagger-ui-es-bundle-core.js.map similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle-core.js.map rename to rest-api/webapp/docs/swagger-ui-es-bundle-core.js.map diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle.js b/rest-api/webapp/docs/swagger-ui-es-bundle.js similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle.js rename to rest-api/webapp/docs/swagger-ui-es-bundle.js diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle.js.map b/rest-api/webapp/docs/swagger-ui-es-bundle.js.map similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-es-bundle.js.map rename to rest-api/webapp/docs/swagger-ui-es-bundle.js.map diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-standalone-preset.js b/rest-api/webapp/docs/swagger-ui-standalone-preset.js similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-standalone-preset.js rename to rest-api/webapp/docs/swagger-ui-standalone-preset.js diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui-standalone-preset.js.map b/rest-api/webapp/docs/swagger-ui-standalone-preset.js.map similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui-standalone-preset.js.map rename to rest-api/webapp/docs/swagger-ui-standalone-preset.js.map diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui.css b/rest-api/webapp/docs/swagger-ui.css similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui.css rename to rest-api/webapp/docs/swagger-ui.css diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui.css.map b/rest-api/webapp/docs/swagger-ui.css.map similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui.css.map rename to rest-api/webapp/docs/swagger-ui.css.map diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui.html b/rest-api/webapp/docs/swagger-ui.html similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui.html rename to rest-api/webapp/docs/swagger-ui.html diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui.js b/rest-api/webapp/docs/swagger-ui.js similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui.js rename to rest-api/webapp/docs/swagger-ui.js diff --git a/ofbiz-rest-impl/webapp/docs/swagger-ui.js.map b/rest-api/webapp/docs/swagger-ui.js.map similarity index 100% rename from ofbiz-rest-impl/webapp/docs/swagger-ui.js.map rename to rest-api/webapp/docs/swagger-ui.js.map diff --git a/ofbiz-rest-impl/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml b/rest-api/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml similarity index 100% rename from ofbiz-rest-impl/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml rename to rest-api/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml diff --git a/ofbiz-rest-impl/webapp/ofbiz-rest-jersey/WEB-INF/web.xml b/rest-api/webapp/ofbiz-rest-jersey/WEB-INF/web.xml similarity index 100% rename from ofbiz-rest-impl/webapp/ofbiz-rest-jersey/WEB-INF/web.xml rename to rest-api/webapp/ofbiz-rest-jersey/WEB-INF/web.xml diff --git a/ofbiz-rest-impl/webapp/ofbiz-rest-jersey/index.jsp b/rest-api/webapp/ofbiz-rest-jersey/index.jsp similarity index 100% rename from ofbiz-rest-impl/webapp/ofbiz-rest-jersey/index.jsp rename to rest-api/webapp/ofbiz-rest-jersey/index.jsp diff --git a/ofbiz-rest-impl/widget/CommonScreens.xml b/rest-api/widget/CommonScreens.xml similarity index 100% rename from ofbiz-rest-impl/widget/CommonScreens.xml rename to rest-api/widget/CommonScreens.xml diff --git a/ofbiz-rest-impl/widget/Ofbiz-rest-jerseyForms.xml b/rest-api/widget/Ofbiz-rest-jerseyForms.xml similarity index 100% rename from ofbiz-rest-impl/widget/Ofbiz-rest-jerseyForms.xml rename to rest-api/widget/Ofbiz-rest-jerseyForms.xml diff --git a/ofbiz-rest-impl/widget/Ofbiz-rest-jerseyMenus.xml b/rest-api/widget/Ofbiz-rest-jerseyMenus.xml similarity index 100% rename from ofbiz-rest-impl/widget/Ofbiz-rest-jerseyMenus.xml rename to rest-api/widget/Ofbiz-rest-jerseyMenus.xml diff --git a/ofbiz-rest-impl/widget/Ofbiz-rest-jerseyScreens.xml b/rest-api/widget/Ofbiz-rest-jerseyScreens.xml similarity index 100% rename from ofbiz-rest-impl/widget/Ofbiz-rest-jerseyScreens.xml rename to rest-api/widget/Ofbiz-rest-jerseyScreens.xml |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 1a6e4f82947f14ab4725d5763985b68972259ca7 Author: Michael Brohl <[hidden email]> AuthorDate: Mon Mar 22 21:34:21 2021 +0100 Improved: Removes "ofbiz" prefix from files and folders, code cleanup (OFBIZ-12197) --- rest-api/config/ApiUiLabels.xml | 20 ------ rest-api/data/Ofbiz-rest-jerseyDemoData.xml | 23 ------- .../Ofbiz-rest-jerseySecurityGroupDemoData.xml | 36 ----------- ...Ofbiz-rest-jerseySecurityPermissionSeedData.xml | 35 ----------- rest-api/data/Ofbiz-rest-jerseyTypeData.xml | 23 ------- rest-api/entitydef/entitymodel.xml | 31 ---------- rest-api/ofbiz-component.xml | 27 +++----- rest-api/servicedef/services.xml | 2 +- ...fbiz-rest-jerseyTests.xml => rest-apiTests.xml} | 2 +- .../ofbiz-rest-jersey/WEB-INF/controller.xml | 47 -------------- rest-api/webapp/ofbiz-rest-jersey/index.jsp | 20 ------ .../WEB-INF/web.xml | 11 +--- rest-api/widget/CommonScreens.xml | 71 ---------------------- rest-api/widget/Ofbiz-rest-jerseyForms.xml | 26 -------- rest-api/widget/Ofbiz-rest-jerseyMenus.xml | 29 --------- rest-api/widget/Ofbiz-rest-jerseyScreens.xml | 40 ------------ 16 files changed, 12 insertions(+), 431 deletions(-) diff --git a/rest-api/config/ApiUiLabels.xml b/rest-api/config/ApiUiLabels.xml index 7cad87e..c1d5a0d 100644 --- a/rest-api/config/ApiUiLabels.xml +++ b/rest-api/config/ApiUiLabels.xml @@ -20,26 +20,6 @@ under the License. <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd"> - <property key="Ofbiz-rest-jerseyApplication"> - <value xml:lang="en">OFBiz-rest-jersey Application</value> - <value xml:lang="zh">Ofbiz-rest-jersey应用程序</value> - <value xml:lang="zh-TW">Ofbiz-rest-jersey應用程式</value> - </property> - <property key="Ofbiz-rest-jerseyCompanyName"> - <value xml:lang="en">OFBiz: OFBiz-rest-jersey</value> - <value xml:lang="zh-TW">OFBiz: OFBiz-rest-jersey</value> - </property> - <property key="Ofbiz-rest-jerseyCompanySubtitle"> - <value xml:lang="en">Part of the Apache OFBiz Family of Open Source Software</value> - <value xml:lang="it">Un modulo della famiglia di software open source Apache OFBiz</value> - <value xml:lang="zh">开源软件OFBiz的组成部分</value> - <value xml:lang="zh-TW">開源軟體OFBiz的組成部分</value> - </property> - <property key="Ofbiz-rest-jerseyViewPermissionError"> - <value xml:lang="en">You are not allowed to view this page.</value> - <value xml:lang="zh">不允许你浏览这个页面。</value> - <value xml:lang="zh-TW">不允許您檢視這個頁面.</value> - </property> <property key="GenericServiceValidationErrorMessage"> <value xml:lang="en">${service} validation failed. The request contained invalid information and could not be processed.</value> </property> diff --git a/rest-api/data/Ofbiz-rest-jerseyDemoData.xml b/rest-api/data/Ofbiz-rest-jerseyDemoData.xml deleted file mode 100644 index b76e67e..0000000 --- a/rest-api/data/Ofbiz-rest-jerseyDemoData.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<entity-engine-xml> - -</entity-engine-xml> \ No newline at end of file diff --git a/rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml b/rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml deleted file mode 100644 index cd952cd..0000000 --- a/rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<entity-engine-xml> - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" - permissionId="OFBIZ-REST-JERSEY_ADMIN"/> - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" - permissionId="OFBIZ-REST-JERSEY_CREATE"/> - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" - permissionId="OFBIZ-REST-JERSEY_DELETE"/> - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" - permissionId="OFBIZ-REST-JERSEY_UPDATE"/> - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FLEXADMIN" - permissionId="OFBIZ-REST-JERSEY_VIEW"/> - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="VIEWADMIN" - permissionId="OFBIZ-REST-JERSEY_VIEW"/> - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="BIZADMIN" - permissionId="OFBIZ-REST-JERSEY_ADMIN"/> -</entity-engine-xml> diff --git a/rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml b/rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml deleted file mode 100644 index 597f97a..0000000 --- a/rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<entity-engine-xml> - <SecurityPermission description="View operations in the OFBiz-rest-jersey Component." - permissionId="OFBIZ-REST-JERSEY_VIEW"/> - <SecurityPermission description="Create operations in the OFBiz-rest-jersey Component." - permissionId="OFBIZ-REST-JERSEY_CREATE"/> - <SecurityPermission description="Update operations in the OFBiz-rest-jersey Component." - permissionId="OFBIZ-REST-JERSEY_UPDATE"/> - <SecurityPermission description="Delete operations in the OFBiz-rest-jersey Component." - permissionId="OFBIZ-REST-JERSEY_DELETE"/> - <SecurityPermission description="ALL operations in the OFBiz-rest-jersey Component." - permissionId="OFBIZ-REST-JERSEY_ADMIN"/> - - <SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="SUPER" permissionId="OFBIZ-REST-JERSEY_ADMIN"/> - -</entity-engine-xml> diff --git a/rest-api/data/Ofbiz-rest-jerseyTypeData.xml b/rest-api/data/Ofbiz-rest-jerseyTypeData.xml deleted file mode 100644 index b76e67e..0000000 --- a/rest-api/data/Ofbiz-rest-jerseyTypeData.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<entity-engine-xml> - -</entity-engine-xml> \ No newline at end of file diff --git a/rest-api/entitydef/entitymodel.xml b/rest-api/entitydef/entitymodel.xml deleted file mode 100644 index 4ffbc30..0000000 --- a/rest-api/entitydef/entitymodel.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd"> - <!-- ========================================================= --> - <!-- ======================== Defaults ======================= --> - <!-- ========================================================= --> - <title>Entity of OFBiz-rest-jersey Component</title> - <description>None</description> - <copyright></copyright> - <version></version> - -</entitymodel> \ No newline at end of file diff --git a/rest-api/ofbiz-component.xml b/rest-api/ofbiz-component.xml index 47bc4f9..ec9764f 100644 --- a/rest-api/ofbiz-component.xml +++ b/rest-api/ofbiz-component.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -<ofbiz-component name="ofbiz-rest-jersey" +<ofbiz-component name="rest-api" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> <!-- define resource loaders; most common is to use the component resource loader --> @@ -26,32 +26,19 @@ under the License. <!-- place the config directory on the classpath to access configuration files --> <classpath type="dir" location="config"/> - <!-- entity resources: model(s), eca(s), group, and data definitions --> - <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> - <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> --> - <entity-resource type="data" reader-name="seed" loader="main" location="data/Ofbiz-rest-jerseyTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" - location="data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" - location="data/Ofbiz-rest-jerseySecurityGroupDemoData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/Ofbiz-rest-jerseyDemoData.xml"/> - + <!-- service resources: model(s), eca(s) and group definitions --> <service-resource type="model" loader="main" location="servicedef/services.xml"/> - <!-- - <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> - <service-resource type="group" loader="main" location="servicedef/groups.xml"/> - --> - <test-suite loader="main" location="testdef/Ofbiz-rest-jerseyTests.xml"/> + <test-suite loader="main" location="testdef/rest-apiTests.xml"/> <!-- web applications; will be mounted when using the embedded container --> - <webapp name="ofbiz-rest-jersey" - title="Rest-jersey" + <webapp name="rest-api" + title="REST API" server="default-server" - location="webapp/ofbiz-rest-jersey" - base-permission="OFBTOOLS,OFBIZ-REST-JERSEY" + location="webapp/rest-api" mount-point="/rest"/> + <webapp name="api-docs" title="REST API Docs" app-bar-display="false" diff --git a/rest-api/servicedef/services.xml b/rest-api/servicedef/services.xml index 759faaa..017f1b4 100644 --- a/rest-api/servicedef/services.xml +++ b/rest-api/servicedef/services.xml @@ -20,7 +20,7 @@ under the License. <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> - <description>OFBiz-rest-jersey Services</description> + <description>rest-api Services</description> <vendor></vendor> <version>1.0</version> diff --git a/rest-api/testdef/Ofbiz-rest-jerseyTests.xml b/rest-api/testdef/rest-apiTests.xml similarity index 94% rename from rest-api/testdef/Ofbiz-rest-jerseyTests.xml rename to rest-api/testdef/rest-apiTests.xml index 35e51bf..5251500 100644 --- a/rest-api/testdef/Ofbiz-rest-jerseyTests.xml +++ b/rest-api/testdef/rest-apiTests.xml @@ -18,7 +18,7 @@ specific language governing permissions and limitations under the License. --> -<test-suite suite-name="Ofbiz-rest-jerseytests" +<test-suite suite-name="rest-api-tests" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd"> diff --git a/rest-api/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml b/rest-api/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml deleted file mode 100644 index b0bdffb..0000000 --- a/rest-api/webapp/ofbiz-rest-jersey/WEB-INF/controller.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://ofbiz.apache.org/Site-Conf" xsi:schemaLocation="http://ofbiz.apache.org/Site-Conf http://ofbiz.apache.org/dtds/site-conf.xsd"> - <!-- The controller elements that are common to all OFBiz components - can be found in the following xml file. A component can override the - elements found in the common-controller.xml file. --> - <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> - - <description>OFBiz-rest-jersey Component Site Configuration File</description> - - <!-- Events to run on every request before security (chains exempt) --> - <!-- - <preprocessor> - </preprocessor> - --> - <!-- Events to run on every request after all other processing (chains exempt) --> - <!-- - <postprocessor> - <event name="test" type="java" path="org.apache.ofbiz.webapp.event.TestEvent" invoke="test"/> - </postprocessor> - --> - - <!-- Request Mappings --> - <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> - - <!-- View Mappings --> - <view-map name="main" type="screen" page="component://ofbiz-rest-jersey/widget/Ofbiz-rest-jerseyScreens.xml#main"/> -</site-conf> \ No newline at end of file diff --git a/rest-api/webapp/ofbiz-rest-jersey/index.jsp b/rest-api/webapp/ofbiz-rest-jersey/index.jsp deleted file mode 100644 index 4ea7d0c..0000000 --- a/rest-api/webapp/ofbiz-rest-jersey/index.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---%> - -<%response.sendRedirect("control/main");%> \ No newline at end of file diff --git a/rest-api/webapp/ofbiz-rest-jersey/WEB-INF/web.xml b/rest-api/webapp/rest-api/WEB-INF/web.xml similarity index 81% rename from rest-api/webapp/ofbiz-rest-jersey/WEB-INF/web.xml rename to rest-api/webapp/rest-api/WEB-INF/web.xml index 9c08a8a..f4038fd 100644 --- a/rest-api/webapp/ofbiz-rest-jersey/WEB-INF/web.xml +++ b/rest-api/webapp/rest-api/WEB-INF/web.xml @@ -19,17 +19,12 @@ under the License. --> <web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"> - <display-name>Apache OFBiz - OFBiz-rest-jersey Component</display-name> - <description>OFBiz-rest-jersey Component of the Apache OFBiz Project</description> + <display-name>Apache OFBiz - rest-api Component</display-name> + <description>rest-api Component of the Apache OFBiz Project</description> - <!-- context-param> - <param-name>webSiteId</param-name> - <param-value>ofbiz-rest-jerseySite</param-value> - <description>A unique ID used to look up the WebSite entity. Only for component using a WebSite entity, like ecommerce</description> - </context-param--> <context-param> <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description> - <param-name>localDispatcherName</param-name><param-value>ofbiz-rest-jersey</param-value> + <param-name>localDispatcherName</param-name><param-value>rest-api</param-value> </context-param> <context-param> <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> diff --git a/rest-api/widget/CommonScreens.xml b/rest-api/widget/CommonScreens.xml deleted file mode 100644 index b99f18b..0000000 --- a/rest-api/widget/CommonScreens.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://ofbiz.apache.org/Widget-Screen" - xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd"> - - <screen name="main-decorator"> - <section> - <actions> - <property-map resource="Ofbiz-rest-jerseyUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - - <set field="layoutSettings.companyName" from-field="uiLabelMap.Ofbiz-rest-jerseyCompanyName" - global="true"/> - <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.Ofbiz-rest-jerseyCompanySubtitle" - global="true"/> - - <set field="activeApp" value="ofbiz-rest-jersey" global="true"/> - <set field="applicationMenuName" value="MainAppBar" global="true"/> - <set field="applicationMenuLocation" - value="component://ofbiz-rest-jersey/widget/Ofbiz-rest-jerseyMenus.xml" global="true"/> - <set field="applicationTitle" from-field="uiLabelMap.Ofbiz-rest-jerseyApplication" global="true"/> - </actions> - <widgets> - <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> - </widgets> - </section> - </screen> - - <screen name="Ofbiz-rest-jerseyCommonDecorator"> - <section> - <actions> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="OFBIZ-REST-JERSEY" action="_VIEW"/> - </condition> - <widgets> - <decorator-section-include name="body"/> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.Ofbiz-rest-jerseyViewPermissionError}</label> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> -</screens> \ No newline at end of file diff --git a/rest-api/widget/Ofbiz-rest-jerseyForms.xml b/rest-api/widget/Ofbiz-rest-jerseyForms.xml deleted file mode 100644 index 0fcdc58..0000000 --- a/rest-api/widget/Ofbiz-rest-jerseyForms.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://ofbiz.apache.org/Widget-Form" - xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd"> - - -</forms> \ No newline at end of file diff --git a/rest-api/widget/Ofbiz-rest-jerseyMenus.xml b/rest-api/widget/Ofbiz-rest-jerseyMenus.xml deleted file mode 100644 index bf7c73c..0000000 --- a/rest-api/widget/Ofbiz-rest-jerseyMenus.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://ofbiz.apache.org/Widget-Menu" - xsi:schemaLocation="http://ofbiz.apache.org/Widget-Menu http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="MainAppBar" title="${uiLabelMap.Ofbiz-rest-jerseyApplication}" extends="CommonAppBarMenu" - extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="main" title="${uiLabelMap.CommonMain}"> - <link target="main"/> - </menu-item> - </menu> -</menus> \ No newline at end of file diff --git a/rest-api/widget/Ofbiz-rest-jerseyScreens.xml b/rest-api/widget/Ofbiz-rest-jerseyScreens.xml deleted file mode 100644 index 05944e3..0000000 --- a/rest-api/widget/Ofbiz-rest-jerseyScreens.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://ofbiz.apache.org/Widget-Screen" - xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd"> - - <screen name="main"> - <section> - <actions> - <set field="headerItem" value="main"/><!-- this highlights the selected menu-item with name "main" --> - </actions> - <widgets> - <decorator-screen name="Ofbiz-rest-jerseyCommonDecorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - -</screens> \ No newline at end of file |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit b5c6a17024013ec655b18975d6878e95f019ee40 Author: Michael Brohl <[hidden email]> AuthorDate: Mon Mar 22 21:36:04 2021 +0100 Improved: Corrects asciidoc levels and follows one-sentence-per-line rule (OFBIZ-12197) --- rest-api/README.adoc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rest-api/README.adoc b/rest-api/README.adoc index e959aa7..98fc07c 100644 --- a/rest-api/README.adoc +++ b/rest-api/README.adoc @@ -1,26 +1,29 @@ = Apache OFBiz® plugin for REST -This initial implementation helps to expose existing or new OFBiz services as REST. To facilitate this, added a new "action" attribute to service elements that helps to determine how a particular service can be accessed via REST. +This initial implementation helps to expose existing or new OFBiz services as REST. +To facilitate this, added a new "action" attribute to service elements that helps to determine how a particular service can be accessed via REST. -==== Important URLs +== Important URLs * API https://localhost:8443/rest * WADL https://localhost:8443/rest/application.wadl * OpenAPI docs https://localhost:8443/docs/swagger-ui.html -==== Endpoints +== Endpoints Once deployed, following URLs can be accessed * GET /rest/services * GET /rest/services/{serviceName}?inParams=<URLEncodedJSON> * POST /rest/services/{serviceName} (For this endpoint, the service in parameters must be part of Request Body) -==== Authentication -API is protected by JWT tokens, although other forms of access tokens may be supported in future. An API client must first needs to authenticate itself using Basic Auth using username and password. Username is nothing but OFBiz 'userLogin'. Token can also be generated using Swagger UI. +== Authentication +API is protected by JWT tokens, although other forms of access tokens may be supported in future. +An API client must first needs to authenticate itself using Basic Auth using username and password. +Username is nothing but OFBiz 'userLogin'. Token can also be generated using Swagger UI. [source, json] ---- curl -X POST "https://localhost:8443/rest/auth/token" -H "accept: application/json" -H "Authorization: Basic YWRtaW46b2ZiaXo=" ---- -If successfully validated, generated token should be received in response - +If successfully validated, generated token should be received in response [source, json] ---- { @@ -43,7 +46,7 @@ GET /rest/services HTTP/1.1 Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJ1c2VyTG9naW5JZCI6ImFkbWluIiwiaXNzIjoiQXBhY2hlT0ZCaXoiLCJleHAiOjE1OTY3MDk4MjAsImlhdCI6MTU5NjcwODAyMH0.9Hj4pkkeQowAMxPLrI_To0WTohxxgVR6FoViyx5HoboTACQZ4iqDyqiIBodkuCVsZwOTPT1RSAQJ0L_oSVMqBA ---- -==== Example +== Example * List All Services (export="true" and verb = "get|post") [source, json] @@ -152,6 +155,3 @@ Response + } } ---- - - - |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 84d705373fcc7043434f02c97507deb7c3ad2fca Author: Michael Brohl <[hidden email]> AuthorDate: Mon Mar 22 22:30:47 2021 +0100 Improved: Fixes html bugs spotted by sonarcloud (OFBIZ-12197) --- rest-api/webapp/docs/oauth2-redirect.html | 4 +++- rest-api/webapp/docs/redoc.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rest-api/webapp/docs/oauth2-redirect.html b/rest-api/webapp/docs/oauth2-redirect.html index d04e1ba..80168cc 100644 --- a/rest-api/webapp/docs/oauth2-redirect.html +++ b/rest-api/webapp/docs/oauth2-redirect.html @@ -1,6 +1,8 @@ <!doctype html> <html lang="en-US"> -<title>Swagger UI: OAuth2 Redirect</title> +<head> + <title>Swagger UI: OAuth2 Redirect</title> +</head> <body> </body> </html> diff --git a/rest-api/webapp/docs/redoc.html b/rest-api/webapp/docs/redoc.html index 94faf4e..f6a1f49 100644 --- a/rest-api/webapp/docs/redoc.html +++ b/rest-api/webapp/docs/redoc.html @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> <!DOCTYPE html> -<html> +<html lang="en-US"> <head> <title>OFBiz REST API</title> <!-- needed for adaptive design --> |
|
|
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 66055a731aa15706044e4612ea8b7f36c4dbe60c Author: Michael Brohl <[hidden email]> AuthorDate: Wed Mar 24 23:16:34 2021 +0100 Improved: Fixes sonarcloud error by using the resource integrity feature for embedding external redoc javascript file (OFBIZ-12197) --- rest-api/webapp/docs/redoc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest-api/webapp/docs/redoc.html b/rest-api/webapp/docs/redoc.html index f6a1f49..5825848 100644 --- a/rest-api/webapp/docs/redoc.html +++ b/rest-api/webapp/docs/redoc.html @@ -36,7 +36,7 @@ under the License. </head> <body> <redoc></redoc> - <script src="https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js"> </script> + <script src="https://cdn.jsdelivr.net/npm/redoc@2.0.0-rc.50/bundles/redoc.standalone.js" integrity="sha384-YWcR83P+iCIwWinEgobyIHtCpa2GHXZY4EGN+8CK2dDrcay1wIz3l4Txk2AEc7Qc"> </script> <script> if (!window.location.origin) { window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : ''); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |