Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71c853fe82 | ||
|
|
7809b73583 | ||
|
|
61c28602c2 | ||
|
|
90d93d5e99 | ||
|
|
87eb402bcd | ||
|
|
015f60f982 | ||
|
|
9020f03390 | ||
|
|
dc9d71fe3b | ||
|
|
d38ff24cf3 | ||
|
|
c4088961d3 | ||
|
|
9853d10bd9 | ||
|
|
5b6e427f24 | ||
|
|
0d8de91657 | ||
|
|
e5b5075126 | ||
|
|
99441469dc | ||
|
|
ddc238a49d | ||
|
|
4cff613b18 | ||
|
|
4442c2adca | ||
|
|
80262418fd | ||
|
|
a48938982d | ||
|
|
901ca14f44 | ||
|
|
a42ea2bdb4 | ||
|
|
e2026b6a50 | ||
|
|
e83559d151 |
+17
-20
@@ -20,15 +20,15 @@ under the License.
|
||||
= Apache OFBiz®
|
||||
|
||||
image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[link=http://www.apache.org/licenses/LICENSE-2.0]
|
||||
image:https://img.shields.io/badge/Version-release18.12-green.svg[link=Version]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release18.12]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg?branch=release18.12]
|
||||
image:https://qpkb254zxeu.montastic.io/badge[link=https://qpkb254zxeu.montastic.io]
|
||||
|
||||
image:https://img.shields.io/badge/Version-release18.12-green.svg[link=https://github.com/apache/ofbiz-framework/tree/release18.12]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml]
|
||||
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg?branch=release18.12[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml]
|
||||
//image:https://sonarcloud.io/api/project_badges/measure?project=apache_ofbiz-framework&metric=alert_status&branch=release18.12[link=notReadyYet]
|
||||
|
||||
If you are reading this file in AsciiDoc format you may want to see it in
|
||||
https://ci.apache.org/projects/ofbiz/site/next/readme/html5/README.html[HTML]
|
||||
or https://ci.apache.org/projects/ofbiz/site/next/readme/pdf/README.pdf[PDF] format
|
||||
https://nightlies.apache.org/ofbiz/stable/readme/html5/[HTML]
|
||||
//or https://nightlies.apache.org/ofbiz/stable/readme/pdf/[HTML] +[PDF] format Not Ready Yet see
|
||||
or https://ci.apache.org/projects/ofbiz/site/stable/readme/pdf/README.pdf[PDF] format
|
||||
|
||||
---
|
||||
|
||||
@@ -71,8 +71,14 @@ The only requirements to run OFBiz is
|
||||
* to have the Java Development Kit (JDK) version 8 installed on your system
|
||||
(not just the JRE, but the full JDK) that you can download from the below link.
|
||||
Make sure of setting the $JAVA_HOME environment variable. +
|
||||
__________________________________________________________________________________________________________________________________________
|
||||
_Note_: Warning: on Windows don't put OFBiz in a directory with space/s in the path.
|
||||
__________________________________________________________________________________________________________________________________________
|
||||
|
||||
https://adoptopenjdk.net/[JDK download], https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244[To know more about the JDK]
|
||||
|
||||
|
||||
|
||||
* If on Windows, a Powershell version >= 7.1.3 installed that you can download from the below link. +
|
||||
https://github.com/PowerShell/PowerShell[Powershell]
|
||||
|
||||
@@ -95,6 +101,7 @@ Unix-like OS: `./gradle/init-gradle-wrapper.sh`
|
||||
[[prepare-ofbiz]]
|
||||
=== Prepare OFBiz:
|
||||
|
||||
==== Clean system and load the complete OFBiz data
|
||||
_________________________________________________________________________________________________________________________________________________________________________________________________________________
|
||||
_Note_: Depending on your Internet connection speed it might take a long time
|
||||
for this step to complete if you are using OFBiz for the first time as it needs
|
||||
@@ -649,9 +656,8 @@ If you need username and password to access the custom repository:
|
||||
[[pull-an-official-plugin-from-source-control]]
|
||||
=== Pull an official plugin from source control
|
||||
|
||||
Download an official plugin from source control (currently subversion) and place
|
||||
it in the plugins directory. In addition, this task also executes the "install"
|
||||
task if it is defined for the plugin being downloaded.
|
||||
Download an official plugin from source control and place it in the plugins directory.
|
||||
In addition, this task also executes the "install" task if it is defined for the plugin being downloaded.
|
||||
|
||||
This task is mostly useful when working on the trunk branch as it pulls in the
|
||||
latest version of a plugin.
|
||||
@@ -659,15 +665,11 @@ latest version of a plugin.
|
||||
`gradlew pullPluginSource -PpluginId=ecommerce`
|
||||
|
||||
________________________________________________________________________________________
|
||||
_Note_: This plugin will have its own .svn directory placed inside the plugin
|
||||
directory.
|
||||
________________________________________________________________________________________
|
||||
|
||||
[[pull-all-official-plugins-from-source-control]]
|
||||
=== Pull all official plugins from source control
|
||||
|
||||
Download all officially supported plugins from source control (currently
|
||||
subversion) and place them inclusive of their ".svn" directory in /plugins.
|
||||
subversion) and place them in /plugins.
|
||||
WARNING! This task deletes the /plugins directory and replaces it with the
|
||||
official plugins.
|
||||
|
||||
@@ -679,11 +681,6 @@ not recommend using this task on releases of OFBiz, instead consider using the
|
||||
"pullPlugin" task to get the correct version of a plugin compatible with your
|
||||
release.
|
||||
|
||||
____________________________________________________________________________________
|
||||
_Note_: All the plugins will share a .svn directory placed in the plugins
|
||||
directory.
|
||||
____________________________________________________________________________________
|
||||
|
||||
[[install-a-plugin]]
|
||||
=== Install a plugin
|
||||
|
||||
|
||||
+16
-5
@@ -37,6 +37,7 @@ import java.util.Map.Entry;
|
||||
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.csv.CSVFormat;
|
||||
import org.apache.commons.csv.CSVFormat.Builder;
|
||||
import org.apache.commons.csv.CSVRecord;
|
||||
import org.apache.ofbiz.accounting.payment.PaymentGatewayServices;
|
||||
import org.apache.ofbiz.accounting.payment.PaymentWorker;
|
||||
@@ -3552,8 +3553,8 @@ public class InvoiceServices {
|
||||
String organizationPartyId = (String) context.get("organizationPartyId");
|
||||
String encoding = System.getProperty("file.encoding");
|
||||
String csvString = Charset.forName(encoding).decode(fileBytes).toString();
|
||||
final BufferedReader csvReader = new BufferedReader(new StringReader(csvString));
|
||||
CSVFormat fmt = CSVFormat.DEFAULT.withHeader();
|
||||
Builder csvFormatBuilder = Builder.create().setHeader();
|
||||
CSVFormat fmt = csvFormatBuilder.build();
|
||||
List<String> errMsgs = new LinkedList<>();
|
||||
List<String> newErrMsgs;
|
||||
String lastInvoiceId = null;
|
||||
@@ -3561,7 +3562,7 @@ public class InvoiceServices {
|
||||
String newInvoiceId = null;
|
||||
int invoicesCreated = 0;
|
||||
|
||||
try {
|
||||
try (BufferedReader csvReader = new BufferedReader(new StringReader(csvString))) {
|
||||
for (final CSVRecord rec : fmt.parse(csvReader)) {
|
||||
currentInvoiceId = rec.get("invoiceId");
|
||||
if (lastInvoiceId == null || !currentInvoiceId.equals(lastInvoiceId)) {
|
||||
@@ -3626,11 +3627,18 @@ public class InvoiceServices {
|
||||
try {
|
||||
invoiceResult = dispatcher.runSync("createInvoice", invoice);
|
||||
if (ServiceUtil.isError(invoiceResult)) {
|
||||
// Eclipse reports here: Resource leak: '<unassigned Closeable value>' is not closed at this location
|
||||
// but it's OK. As csvReader is in a try-with-ressource it will be closed anyway
|
||||
// I prefer to not put @SuppressWarnings("resource") to the whole method
|
||||
// BTW to be consistent Eclipse should also reports the same issue in PartyService (see there)
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(invoiceResult));
|
||||
}
|
||||
} catch (GenericServiceException e) {
|
||||
csvReader.close();
|
||||
Debug.logError(e, module);
|
||||
// Eclipse reports here: Resource leak: '<unassigned Closeable value>' is not closed at this location
|
||||
// but it's OK. As csvReader is in a try-with-ressource it will be closed anyway
|
||||
// I prefer to not put @SuppressWarnings("resource") to the whole method
|
||||
// BTW to be consistent Eclipse should also reports the same issue in PartyService (see there)
|
||||
return ServiceUtil.returnError(e.getMessage());
|
||||
}
|
||||
newInvoiceId = (String) invoiceResult.get("invoiceId");
|
||||
@@ -3685,10 +3693,13 @@ public class InvoiceServices {
|
||||
try {
|
||||
Map<String, Object> result = dispatcher.runSync("createInvoiceItem", invoiceItem);
|
||||
if (ServiceUtil.isError(result)) {
|
||||
// Eclipse reports here: Resource leak: '<unassigned Closeable value>' is not closed at this location
|
||||
// but it's OK. As csvReader is in a try-with-ressource it will be closed anyway
|
||||
// I prefer to not put @SuppressWarnings("resource") to the whole method
|
||||
// BTW to be consistent Eclipse should also reports the same issue in PartyService (see there)
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));
|
||||
}
|
||||
} catch (GenericServiceException e) {
|
||||
csvReader.close();
|
||||
Debug.logError(e, module);
|
||||
return ServiceUtil.returnError(e.getMessage());
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.csv.CSVFormat;
|
||||
import org.apache.commons.csv.CSVFormat.Builder;
|
||||
import org.apache.commons.csv.CSVRecord;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.UtilDateTime;
|
||||
@@ -2326,7 +2327,8 @@ public class PartyServices {
|
||||
ByteBuffer fileBytes = (ByteBuffer) context.get("uploadedFile");
|
||||
String encoding = System.getProperty("file.encoding");
|
||||
String csvString = Charset.forName(encoding).decode(fileBytes).toString();
|
||||
CSVFormat fmt = CSVFormat.DEFAULT.withHeader();
|
||||
Builder csvFormatBuilder = Builder.create().setHeader();
|
||||
CSVFormat fmt = csvFormatBuilder.build();
|
||||
List<String> errMsgs = new LinkedList<>();
|
||||
List<String> newErrMsgs = new LinkedList<>();
|
||||
String lastPartyId = null; // last partyId read from the csv file
|
||||
@@ -2356,7 +2358,7 @@ public class PartyServices {
|
||||
|
||||
|
||||
try (BufferedReader csvReader = new BufferedReader(new StringReader(csvString))) {
|
||||
for (final CSVRecord rec : fmt.parse(csvReader)) {
|
||||
for (CSVRecord rec : fmt.parse(csvReader)) {
|
||||
if (UtilValidate.isNotEmpty(rec.get("partyId"))) {
|
||||
currentPartyId = rec.get("partyId");
|
||||
}
|
||||
|
||||
+10
-9
@@ -82,7 +82,7 @@ checkstyle {
|
||||
// the sum of errors that were present before introducing the
|
||||
// ‘checkstyle’ tool present in the framework and in the official
|
||||
// plugins.
|
||||
maxErrors = 38802
|
||||
maxErrors = 39638
|
||||
// Currently there are a lot of errors so we need to temporarily
|
||||
// hide them to avoid polluting the terminal output.
|
||||
showViolations = false
|
||||
@@ -190,13 +190,14 @@ dependencies {
|
||||
compile 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
|
||||
compile 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
|
||||
compile 'org.apache.httpcomponents:httpclient-cache:4.5.6'
|
||||
compile 'org.apache.logging.log4j:log4j-api:2.15.0' // the API of log4j 2
|
||||
compile 'org.apache.logging.log4j:log4j-api:2.17.1' // the API of log4j 2
|
||||
compile 'org.apache.logging.log4j:log4j-web:2.17.1' //???
|
||||
compile 'org.apache.poi:poi:3.17'
|
||||
compile 'org.apache.pdfbox:pdfbox:2.0.24'
|
||||
compile 'org.apache.shiro:shiro-core:1.4.0'
|
||||
compile 'org.apache.sshd:sshd-core:1.7.0'
|
||||
compile 'org.apache.tika:tika-core:1.26'
|
||||
compile 'org.apache.tika:tika-parsers:1.26'
|
||||
compile 'org.apache.tika:tika-core:1.28'
|
||||
compile 'org.apache.tika:tika-parsers:1.28'
|
||||
compile 'org.apache.tomcat:tomcat-catalina-ha:9.0.54'
|
||||
compile 'org.apache.tomcat:tomcat-catalina:9.0.54'
|
||||
compile 'org.apache.tomcat:tomcat-jasper:9.0.54'
|
||||
@@ -231,11 +232,11 @@ dependencies {
|
||||
runtime 'org.apache.axis2:axis2-transport-local:1.7.8'
|
||||
runtime 'org.apache.derby:derby:10.14.2.0'
|
||||
runtime 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:1.1'
|
||||
runtime 'org.apache.logging.log4j:log4j-1.2-api:2.15.0' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-core:2.15.0' // the implementation of the log4j 2 API
|
||||
runtime 'org.apache.logging.log4j:log4j-jul:2.15.0' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0' // for external jars using slf4j: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-jcl:2.15.0' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
|
||||
runtime 'org.apache.logging.log4j:log4j-1.2-api:2.17.1' // for external jars using the old log4j1.2: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-core:2.17.1' // the implementation of the log4j 2 API
|
||||
runtime 'org.apache.logging.log4j:log4j-jul:2.17.1' // for external jars using the java.util.logging: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1' // for external jars using slf4j: routes logging to log4j 2
|
||||
runtime 'org.apache.logging.log4j:log4j-jcl:2.17.1' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
|
||||
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
|
||||
|
||||
// plugin libs
|
||||
|
||||
@@ -67,10 +67,11 @@ under the License.
|
||||
<entity-xml action="assert" entity-xml-url="component://service/testdef/data/ServiceEcaGlobalEventAssertData.xml"/>
|
||||
</test-case>
|
||||
|
||||
<test-case case-name="service-xml-rpc">
|
||||
<!-- This alone should allow Buildbot 3.2 to run the integration tests, cf OFBIZ-12456 -->
|
||||
<!-- <test-case case-name="service-xml-rpc">
|
||||
<junit-test-suite class-name="org.apache.ofbiz.service.test.XmlRpcTests"/>
|
||||
</test-case>
|
||||
<test-case case-name="service-xml-rpc-local-engine">
|
||||
<service-test service-name="testXmlRpcClientAdd"/>
|
||||
</test-case>
|
||||
</test-case!-->
|
||||
</test-suite>
|
||||
|
||||
@@ -23,4 +23,4 @@ if exist "%~dp0gradle\wrapper\gradle-wrapper.jar" (
|
||||
exit /b
|
||||
)
|
||||
|
||||
pwsh -command " Start-Process pwsh -Verb RunAs \""-Command `\""cd '%cd%'; & 'gradle\init-gradle-wrapper.ps1';`\""\"" "
|
||||
%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\powershell.exe -command " Start-Process pwsh -Verb RunAs \""-Command `\""cd '%cd%'; & 'gradle\init-gradle-wrapper.ps1';`\""\"" "
|
||||
|
||||
+1
-1
@@ -3,4 +3,4 @@ Place your custom jar files in here.
|
||||
If you want to use a public open source library, it is recommended
|
||||
that you do not place the library in here. Instead declare it as a
|
||||
dependency in your build scripts (build.gradle files) by finding the
|
||||
appropriate library in jcenter (https://bintray.com/bintray/jcenter)
|
||||
appropriate library in Maven (https://search.maven.org/)
|
||||
|
||||
@@ -695,7 +695,7 @@ Parameter: delegatorName, String, optional - name of the delegator in context.
|
||||
<#macro makeHyperlinkString hiddenFormName imgSrc title alternate linkUrl description linkStyle="" event="" action="" targetParameters="" targetWindow="" confirmation="" uniqueItemName="" height="" width="" id="">
|
||||
<#if uniqueItemName?has_content>
|
||||
<#local params = "{"presentation": "layer"">
|
||||
<#if targetParameters?has_content>
|
||||
<#if targetParameters?has_content && !targetParameters?is_hash>
|
||||
<#local parameterMap = targetParameters?eval>
|
||||
<#local parameterKeys = parameterMap?keys>
|
||||
<#list parameterKeys as key>
|
||||
|
||||
Reference in New Issue
Block a user