Compare commits
224
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b17c50ce7 | ||
|
|
6271d220b6 | ||
|
|
8d49af4005 | ||
|
|
2f5b8d33e3 | ||
|
|
326e0f12a4 | ||
|
|
2dda5b7095 | ||
|
|
7c3a03c16d | ||
|
|
d890ebaedc | ||
|
|
5a069a9991 | ||
|
|
2b15c0302c | ||
|
|
2e88059bfc | ||
|
|
123d9ed67f | ||
|
|
0bfd33a274 | ||
|
|
e1e7c2a4d3 | ||
|
|
f0ee921873 | ||
|
|
725c8543e0 | ||
|
|
858cd36e90 | ||
|
|
3742e034a7 | ||
|
|
14e581ff35 | ||
|
|
4fd4cfc05a | ||
|
|
69ce0dffc8 | ||
|
|
2c7a414cc2 | ||
|
|
717bd4ba43 | ||
|
|
564b605d55 | ||
|
|
2ce14c8fe1 | ||
|
|
7af07c808b | ||
|
|
f089d59389 | ||
|
|
8ef5896077 | ||
|
|
57183eea13 | ||
|
|
27adfed9f0 | ||
|
|
02cd3b33b0 | ||
|
|
1a5bca9190 | ||
|
|
d75ef8212d | ||
|
|
703a32b41f | ||
|
|
9510fc9389 | ||
|
|
7fb8780c97 | ||
|
|
921db68bde | ||
|
|
6b1d71d91a | ||
|
|
c4c3012916 | ||
|
|
ac1595b304 | ||
|
|
15bb640a83 | ||
|
|
7933fef9f2 | ||
|
|
5b0b80f795 | ||
|
|
5560130451 | ||
|
|
af5d61b051 | ||
|
|
2cf6476a79 | ||
|
|
4138bf2a34 | ||
|
|
44cb8dd327 | ||
|
|
9c0c43365f | ||
|
|
58f2b14ee8 | ||
|
|
20e1e1fae7 | ||
|
|
c32abb81d2 | ||
|
|
9dd2a255e9 | ||
|
|
69f00cff78 | ||
|
|
d93f7ce590 | ||
|
|
7756b11421 | ||
|
|
2876adf26c | ||
|
|
b5cdcd9efc | ||
|
|
78f09e61ad | ||
|
|
ec4bff76a0 | ||
|
|
d6c6330b39 | ||
|
|
2b8f4f8b64 | ||
|
|
392f18f913 | ||
|
|
1cf9d9110b | ||
|
|
b06521c356 | ||
|
|
26a2be1392 | ||
|
|
a0b2f55b40 | ||
|
|
7add713a10 | ||
|
|
315bdea44b | ||
|
|
a1e495de19 | ||
|
|
4a26aecbf5 | ||
|
|
a5e96763e4 | ||
|
|
00200bfaca | ||
|
|
bbc63bc470 | ||
|
|
e1d57fba00 | ||
|
|
24d9328cdf | ||
|
|
2d15771d56 | ||
|
|
d13264b584 | ||
|
|
aa4791f120 | ||
|
|
e87747dcb9 | ||
|
|
3982f8d526 | ||
|
|
540f5c80cd | ||
|
|
637e02978c | ||
|
|
363e0be770 | ||
|
|
ba6470b9ea | ||
|
|
00d875251c | ||
|
|
71ff63a043 | ||
|
|
ce2f66b720 | ||
|
|
aaed04d7c8 | ||
|
|
13001ee048 | ||
|
|
e50ad56bb9 | ||
|
|
7ff8fb814e | ||
|
|
dc57528fd4 | ||
|
|
57c15f615d | ||
|
|
9d3631e278 | ||
|
|
983f4b95ae | ||
|
|
f741bb2277 | ||
|
|
f6176dba99 | ||
|
|
2a30d57118 | ||
|
|
91de16a55c | ||
|
|
e1cfe58828 | ||
|
|
cc8ee48154 | ||
|
|
1f965ca30d | ||
|
|
9b45ab7aff | ||
|
|
7400899b58 | ||
|
|
ce0b8903ea | ||
|
|
f6450a01c5 | ||
|
|
008246bf7b | ||
|
|
28a6d4391a | ||
|
|
6bf785654a | ||
|
|
4925d81d07 | ||
|
|
6dc266996e | ||
|
|
69828b37ad | ||
|
|
8640250331 | ||
|
|
726ebe8493 | ||
|
|
85db312077 | ||
|
|
744fa72316 | ||
|
|
f1e8ea734f | ||
|
|
faadf5a622 | ||
|
|
a353cda8b6 | ||
|
|
8622a761e0 | ||
|
|
4de58fc206 | ||
|
|
26075f06a8 | ||
|
|
f83be8652e | ||
|
|
8390abb855 | ||
|
|
fddc3ac8c1 | ||
|
|
dcfa5495ad | ||
|
|
3cfed4c657 | ||
|
|
977d2afb0f | ||
|
|
31a3a75938 | ||
|
|
5ebc88d213 | ||
|
|
b9b22a56c7 | ||
|
|
09a4b32ec2 | ||
|
|
9a0bda00f8 | ||
|
|
9058351d1f | ||
|
|
084eb85c0b | ||
|
|
95d3aadcb5 | ||
|
|
8dc864ff71 | ||
|
|
1662e5b42e | ||
|
|
ca62bd6cef | ||
|
|
c0b11bdfad | ||
|
|
bf0c628dfb | ||
|
|
b0b4ba4d56 | ||
|
|
346ddf229e | ||
|
|
4c8141e07a | ||
|
|
c248af0c55 | ||
|
|
b7b7cad1a2 | ||
|
|
76beb10627 | ||
|
|
0e3b1c7a49 | ||
|
|
ba15f2ec77 | ||
|
|
6622277585 | ||
|
|
791be06575 | ||
|
|
4b8ee87aef | ||
|
|
accca2d388 | ||
|
|
cb228cd11f | ||
|
|
0eeaee6a25 | ||
|
|
f6353957e2 | ||
|
|
4a71a959a6 | ||
|
|
b09fa66ed3 | ||
|
|
8120f75b21 | ||
|
|
4079b54ece | ||
|
|
a603349b55 | ||
|
|
685b7c3d82 | ||
|
|
e47e0142a0 | ||
|
|
7a46ad7a4c | ||
|
|
abad801b0c | ||
|
|
f914203956 | ||
|
|
079e909f21 | ||
|
|
260c0bb36b | ||
|
|
5414813438 | ||
|
|
f45c3ce988 | ||
|
|
7252dbf4e3 | ||
|
|
aec541efe1 | ||
|
|
38a4202d91 | ||
|
|
482df0ba5e | ||
|
|
673fddf72b | ||
|
|
16b8a789af | ||
|
|
78e1ee1795 | ||
|
|
e375286c74 | ||
|
|
17f4d36ec1 | ||
|
|
cbeffa91f0 | ||
|
|
d708d9afcb | ||
|
|
d913366851 | ||
|
|
c7a5b22e0e | ||
|
|
78cb314066 | ||
|
|
c502a978a0 | ||
|
|
babd23282e | ||
|
|
dc60f6fdb3 | ||
|
|
6b04468f45 | ||
|
|
039d51062c | ||
|
|
454230e613 | ||
|
|
4cd701023c | ||
|
|
95a65c3dd2 | ||
|
|
41737adca3 | ||
|
|
27c91802fc | ||
|
|
45535e34cb | ||
|
|
972401bb9d | ||
|
|
5eadb77a88 | ||
|
|
520cc35935 | ||
|
|
0e20d16cfd | ||
|
|
6189bd8ddd | ||
|
|
8a4a68e9f9 | ||
|
|
4b43b0c639 | ||
|
|
9f5ebc48fd | ||
|
|
9530d4b441 | ||
|
|
242e62d6f3 | ||
|
|
1e8ffb4906 | ||
|
|
b14516202d | ||
|
|
5b5029312a | ||
|
|
42ad34f0b6 | ||
|
|
793628bb15 | ||
|
|
84e102a6a1 | ||
|
|
27e57522b1 | ||
|
|
cf936d6c5e | ||
|
|
7e03082d92 | ||
|
|
1617226897 | ||
|
|
bb26cc1c62 | ||
|
|
09270a1c34 | ||
|
|
82ef7a5871 | ||
|
|
a16271e5c3 | ||
|
|
0c7be39acb | ||
|
|
0355006c62 | ||
|
|
b571234062 | ||
|
|
3d9b551d65 |
@@ -0,0 +1,11 @@
|
||||
Improved:
|
||||
Implemented:
|
||||
Documented:
|
||||
Completed:
|
||||
Reverted:
|
||||
Fixed:
|
||||
(OFBIZ-)
|
||||
|
||||
Explanation
|
||||
|
||||
Thanks:
|
||||
+1
-1
@@ -2,7 +2,7 @@ bin/
|
||||
build/
|
||||
applications/*/build
|
||||
framework/*/build
|
||||
plugins/
|
||||
/plugins/
|
||||
runtime/git-rebase/*
|
||||
runtime/SvnInfo.ftl
|
||||
runtime/GitInfo.ftl
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
Welcome to Apache OFBiz! A powerful top level Apache software project. OFBiz
|
||||
is an Enterprise Resource Planning (ERP) System written in Java and houses a
|
||||
large set of libraries, entities, services and features to run all aspects of
|
||||
your business.
|
||||
|
||||
== System requirements
|
||||
|
||||
The only requirement 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) which
|
||||
you can download from the below link. Make sure of setting the $JAVA_HOME
|
||||
environment variable.
|
||||
|
||||
https://adoptopenjdk.net/[JDK download]
|
||||
|
||||
|
||||
== Quick start
|
||||
|
||||
To quickly install and fire-up OFBiz, please follow the below instructions from
|
||||
the command line at the OFBiz top level directory (folder).
|
||||
|
||||
=== Download the Gradle wrapper:
|
||||
|
||||
MS Windows: init-gradle-wrapper
|
||||
Unix-like OS: ./gradle/init-gradle-wrapper
|
||||
|
||||
|
||||
=== 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
|
||||
to download all dependencies. So please be patient!
|
||||
_______________________________________________________________________________
|
||||
|
||||
MS Windows: gradlew cleanAll loadAll
|
||||
Unix-like OS: ./gradlew cleanAll loadAll
|
||||
|
||||
=====Note:
|
||||
As the later step, to install without the demo data follow:
|
||||
(beware this is for development or production, not trying)
|
||||
|
||||
Windows: gradlew cleanAll "ofbiz --load-data readers=seed,seed-initial" loadAdminUserLogin -PuserLoginId=admin
|
||||
Unix-like OS: ./gradlew cleanAll "ofbiz --load-data readers=seed,seed-initial" loadAdminUserLogin -PuserLoginId=admin
|
||||
|
||||
The OFBiz install will be empty, there will be no chart of accounts, no transactions, no products, no customers and no suppliers.
|
||||
You can't log to the E-Commerce Store. You will get: "A Product Store has not been defined for this ecommerce site. A Product Store can be created using the ofbizsetup wizard."
|
||||
|
||||
=== Start OFBiz:
|
||||
|
||||
MS Windows: gradlew ofbiz
|
||||
Unix-like OS: ./gradlew ofbiz
|
||||
|
||||
_______________________________________________________________________________
|
||||
Note: Ignore the % progress indicator because this task does not end as long
|
||||
as OFBiz is running.
|
||||
_______________________________________________________________________________
|
||||
|
||||
=== Visit OFBiz through your browser:
|
||||
|
||||
https://localhost:8443/webtools
|
||||
|
||||
== Going further
|
||||
To complete your installation and use OFBiz please read README.adoc
|
||||
You may prefer to read this AsciiDoc file in HTML format.
|
||||
For that simply follow:
|
||||
https://asciidoctor.org/docs/convert-documents/#converting-a-document-to-html
|
||||
@@ -186,24 +186,19 @@
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright 2001-2008 The Apache Software Foundation
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
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
|
||||
Licensed 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
|
||||
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.
|
||||
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.
|
||||
|
||||
=========================================================================
|
||||
|
||||
@@ -219,42 +214,5 @@ For details, see themes/common/webapp/common/js/plugins/date/timezones.
|
||||
=========================================================================
|
||||
|
||||
This product bundles "Date Format 1.2.3", which is available
|
||||
under the "MIT" license.
|
||||
under the "MIT" license.
|
||||
For details, see themes/common/webapp/common/js/plugins/date/date.format-1.2.3*
|
||||
|
||||
=========================================================================
|
||||
|
||||
This product bundles "jQuery" and "jQuery" plugins and extensions, which are available
|
||||
under the "MIT" license. For details, see:
|
||||
themes/common/webapp/common/js/jquery
|
||||
plugins/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js
|
||||
plugins/webpos/webapp/webpos/images/js/WebPosHotkeys.js
|
||||
|
||||
=========================================================================
|
||||
|
||||
This product bundles files from the "Birt" technology platform (www.eclipse.org/birt/)
|
||||
which are available under the "Eclipse Public License - v 1.0".
|
||||
For details, see plugins/birt/webapp/birt/webcontent/birt/
|
||||
|
||||
=========================================================================
|
||||
|
||||
This product bundles "Webhelp for DocBook", which is available
|
||||
under the "MIT" License. For details, see plugins/cmssite/template/docbook/webhelp/
|
||||
|
||||
=========================================================================
|
||||
|
||||
This product bundles "DocBook XSL Stylesheets 1.77.1", which is available
|
||||
under the "MIT" license.
|
||||
For details, see plugins/cmssite/template/docbook/
|
||||
=========================================================================
|
||||
|
||||
This product bundles "Openlayers", which is available
|
||||
under the "FreeBSD" license.
|
||||
For details, see themes/common/webapp/images/OpenLayers-2.13.1-modified-for-CSP-.js
|
||||
=========================================================================
|
||||
|
||||
This product bundles "Bootstrap", which is available
|
||||
under the "MIT" license.
|
||||
For details, see:
|
||||
plugins/ecommerce/webapp/ecommerce/js
|
||||
plugins/ecommerce/webapp/ecommerce/css
|
||||
|
||||
+32
-15
@@ -19,6 +19,12 @@ under the License.
|
||||
[[apache-ofbiz]]
|
||||
= Apache OFBiz®
|
||||
|
||||
If you are reading this file in AsciiDoc format you may want to see it in
|
||||
https://ci.apache.org/projects/ofbiz/site/stable/readme/html5/README.html[HTML]
|
||||
or https://ci.apache.org/projects/ofbiz/site/stable/readme/pdf/README.pdf[PDF] format
|
||||
|
||||
---
|
||||
|
||||
Welcome to *Apache OFBiz*! A powerful top level Apache software project. OFBiz
|
||||
is an Enterprise Resource Planning (ERP) System written in Java and houses a
|
||||
large set of libraries, entities, services and features to run all aspects of
|
||||
@@ -53,14 +59,17 @@ ________________________________________________________________________________
|
||||
[[system-requirements]]
|
||||
== System requirements
|
||||
|
||||
The only requirement 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) which
|
||||
you can download from the below link. Make sure of setting the $JAVA_HOME
|
||||
environment variable.
|
||||
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. +
|
||||
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]
|
||||
|
||||
https://adoptopenjdk.net/[JDK download]
|
||||
|
||||
https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244[To know more about the JDK]
|
||||
|
||||
[[quick-start]]
|
||||
// tag::quickstart[]
|
||||
@@ -69,6 +78,13 @@ https://medium.com/@javachampions/java-is-still-free-2-0-0-6b9aa8d6d244[To know
|
||||
To quickly install and fire-up OFBiz, please follow the below instructions from
|
||||
the command line at the OFBiz top level directory (folder).
|
||||
|
||||
[[download-the-gradle-wrapper]]
|
||||
=== Download the Gradle wrapper:
|
||||
|
||||
MS Windows: `init-gradle-wrapper`
|
||||
|
||||
Unix-like OS: `./gradle/init-gradle-wrapper.sh`
|
||||
|
||||
[[prepare-ofbiz]]
|
||||
=== Prepare OFBiz:
|
||||
|
||||
@@ -118,8 +134,10 @@ Once proper mitigations to the security issues are complete the OFBiz team will
|
||||
disclose this information to the public mailing list.
|
||||
|
||||
You can find more information about security in OFBiz at
|
||||
https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure[Keeping
|
||||
OFBiz secure]
|
||||
https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure[Keeping OFBiz secure]
|
||||
|
||||
[CAUTION]
|
||||
In production never use the credentials contained in demo data. Not only the admin credentials, but all of them.
|
||||
|
||||
[[build-system-syntax]]
|
||||
== Build system syntax
|
||||
@@ -261,8 +279,7 @@ operating system kill command. Use this command to force OFBiz termination if
|
||||
the --shutdown command does not work. Usually this is needed when in the middle
|
||||
of data loading or testing in OFBiz.
|
||||
|
||||
Warning: Be careful in using this command as force termination might lead to
|
||||
inconsistent state / data
|
||||
Warning: Be careful in using this command as force termination might lead to inconsistent state / data
|
||||
|
||||
`gradlew terminateOfbiz`
|
||||
|
||||
@@ -373,7 +390,7 @@ Example:
|
||||
Beware that copying this command in Microsoft Word will automatically transform
|
||||
the double dash in en dashes (Unicode 0x2013: –) Other cases not related to Word
|
||||
were also reported.So when this command does not work check that you are using
|
||||
dash! text
|
||||
dash!
|
||||
|
||||
[[load-all-ofbiz-data]]
|
||||
==== Load all OFBiz data
|
||||
@@ -381,13 +398,13 @@ dash! text
|
||||
Loads all data sets; meant for initial loading of generic OFBiz data. Can be
|
||||
applied for development, testing, demonstration, etc. purposes. Be aware that
|
||||
executing this task can result in your data being overwritten in your database
|
||||
of choice. Use with caution in production environments.
|
||||
of choice.
|
||||
|
||||
`gradlew loadAll`
|
||||
`gradlew loadAll` OR `gradlew "ofbiz --load-data"`
|
||||
|
||||
OR
|
||||
[CAUTION]
|
||||
Use with caution in production environments.
|
||||
|
||||
`gradlew "ofbiz --load-data"`
|
||||
|
||||
[[load-seed-data]]
|
||||
==== Load seed data
|
||||
|
||||
@@ -1,760 +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.
|
||||
-->
|
||||
Apache OFBiz®
|
||||
=============
|
||||
|
||||
Welcome to __Apache OFBiz__! A powerful top level Apache software project.
|
||||
OFBiz is an Enterprise Resource Planning (ERP) System written in Java and
|
||||
houses a large set of libraries, entities, services and features to run
|
||||
all aspects of your business.
|
||||
|
||||
For more details about OFBiz please visit the OFBiz Documentation page:
|
||||
|
||||
[OFBiz documentation](http://ofbiz.apache.org/documentation.html)
|
||||
|
||||
[OFBiz License](http://www.apache.org/licenses/LICENSE-2.0)
|
||||
|
||||
>_Note_: If you want to use Eclipse, read the "Setup eclipse project for OFBiz"
|
||||
section to set it up.
|
||||
|
||||
>_Note_: If you want to use an external database like MySQL or PostgreSQL, read
|
||||
the "Setup an external database" section to set it up.
|
||||
|
||||
>_Note_: If you want to run OFBiz without an internet connection, read the
|
||||
"Running gradle tasks without an internet connection" section.
|
||||
|
||||
>_Note_: The directory structure and repositories have changed. For more
|
||||
information read the "Repository and directory structure" section.
|
||||
|
||||
System requirements
|
||||
-------------------
|
||||
|
||||
The only requirement 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) which
|
||||
you can download from the below link. Make sure of setting the $JAVA_HOME
|
||||
environment variable.
|
||||
|
||||
[JDK download](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
|
||||
|
||||
Quick start
|
||||
-----------
|
||||
To quickly install and fire-up OFBiz, please follow the below instructions
|
||||
from the command line at the OFBiz top level directory (folder)
|
||||
|
||||
In case of problems visit our [Further reading section](#further-reading)
|
||||
|
||||
### Prepare OFBiz:
|
||||
|
||||
>_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 to download all dependencies. So please be patient!
|
||||
|
||||
MS Windows:
|
||||
`gradlew cleanAll loadAll`
|
||||
|
||||
Unix-like OS:
|
||||
`./gradlew cleanAll loadAll`
|
||||
|
||||
### Start OFBiz:
|
||||
|
||||
MS Windows:
|
||||
`gradlew ofbiz`
|
||||
|
||||
Unix-like OS:
|
||||
`./gradlew ofbiz`
|
||||
|
||||
>_Note_: Ignore the % progress indicator because this task does not end as
|
||||
long as OFBiz is running.
|
||||
|
||||
### Visit OFBiz through your browser:
|
||||
|
||||
[Order Back Office](https://localhost:8443/ordermgr)
|
||||
|
||||
[Accounting Back Office](https://localhost:8443/accounting)
|
||||
|
||||
[Administrator interface](https://localhost:8443/webtools)
|
||||
|
||||
You can log in with the user __admin__ and password __ofbiz__.
|
||||
|
||||
Security
|
||||
--------
|
||||
|
||||
If you find a security issue, please report it to: security @ ofbiz.apache.org.
|
||||
Once proper mitigations to the security issues are complete the OFBiz team will
|
||||
disclose this information to the public mailing list.
|
||||
|
||||
You can find more information about security in OFBiz at
|
||||
[Keeping OFBiz secure](https://cwiki.apache.org/confluence/display/OFBIZ/Keeping+OFBiz+secure)
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
Build system syntax
|
||||
-------------------
|
||||
|
||||
All build tasks are executed using the __Gradle__ build system which
|
||||
is embedded in OFBiz. To execute build tasks go to OFBiz top-level
|
||||
directory (folder) and execute tasks from there.
|
||||
|
||||
### Operating System Syntax
|
||||
|
||||
The syntax for tasks differ slightly between windows and Unix-like systems
|
||||
|
||||
- __Windows__: `gradlew <tasks-in-here>`
|
||||
|
||||
- __Unix-like__: `./gradlew <tasks-in-here>`
|
||||
|
||||
For the rest of this document, we will use the windows syntax, if you are on
|
||||
a Unix-like system, you need to add the `./` to gradlew
|
||||
|
||||
### Types of tasks in Gradle
|
||||
|
||||
There are two types of tasks designed for OFBiz in Gradle:
|
||||
|
||||
- __Standard tasks__: To execute general standard Gradle tasks
|
||||
|
||||
- __OFBiz server tasks__: To execute OFBiz startup commands. These
|
||||
tasks start with one of the following words:
|
||||
- __ofbiz__ : standard server commands
|
||||
- __ofbizDebug__ : server commands running in remote debug mode
|
||||
- __ofbizBackground__ ; server commands running in a background forked process
|
||||
|
||||
Tips:
|
||||
|
||||
- OFBiz __server commands__ require __"quoting"__ the
|
||||
commands. For example: `gradlew "ofbiz --help"`
|
||||
|
||||
- Shortcuts to task names can be used by writing the
|
||||
first letter of every word in a task name. However, you
|
||||
cannot use the shortcut form for OFBiz server tasks.
|
||||
Example: `gradlew loadAdminUserLogin -PuserLoginId=myadmin` = `gradlew lAUL -PuserLoginId=myadmin`
|
||||
|
||||
- Dependent tasks can be skipped with the -x switch.
|
||||
Example: `gradlew build -x test` does not run the tests within the build.
|
||||
|
||||
#### Example standard tasks
|
||||
|
||||
`gradlew build`
|
||||
|
||||
`gradlew cleanAll loadAll testIntegration`
|
||||
|
||||
#### Example OFBiz server tasks
|
||||
|
||||
`gradlew "ofbiz --help"`
|
||||
|
||||
`gradlew "ofbizDebug --test"`
|
||||
|
||||
`gradlew "ofbizBackground --start --portoffset 10000"`
|
||||
|
||||
`gradlew "ofbiz --shutdown --portoffset 10000"`
|
||||
|
||||
`gradlew ofbiz` (default is --start)
|
||||
|
||||
#### Example mixed tasks (standard and OFBiz server)
|
||||
|
||||
`gradlew cleanAll loadAll "ofbiz --start --portoffset 10000"`
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
Quick reference
|
||||
---------------
|
||||
|
||||
You can use the below common list of tasks as a quick reference
|
||||
for controlling the system. This document uses the windows task
|
||||
syntax, if you are on a Unix-like system, you need to add the
|
||||
`./` to gradlew i.e. `./gradlew`
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
### Help tasks
|
||||
|
||||
#### List OFBiz server commands
|
||||
|
||||
List all available commands to control the OFBiz server
|
||||
|
||||
`gradlew "ofbiz --help"`
|
||||
|
||||
#### List build tasks
|
||||
|
||||
List all available tasks from the build system
|
||||
|
||||
`gradlew tasks`
|
||||
|
||||
#### List build projects
|
||||
|
||||
List all available projects in the build system
|
||||
|
||||
`gradlew projects`
|
||||
|
||||
#### Gradle build system help
|
||||
|
||||
Show usage and options for the Gradle build system
|
||||
|
||||
`gradlew --help`
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
### Server command tasks
|
||||
|
||||
#### Start OFBiz
|
||||
|
||||
`gradlew "ofbiz --start"`
|
||||
|
||||
start is the default server task so this also works:
|
||||
|
||||
`gradlew ofbiz`
|
||||
|
||||
#### Shutdown OFBiz
|
||||
|
||||
`gradlew "ofbiz --shutdown"`
|
||||
|
||||
#### Get OFBiz status
|
||||
|
||||
`gradlew "ofbiz --status"`
|
||||
|
||||
#### Force OFBiz shutdown
|
||||
|
||||
Terminate all running OFBiz server instances by calling
|
||||
the appropriate operating system kill command. Use this
|
||||
command to force OFBiz termination if the --shutdown
|
||||
command does not work. Usually this is needed when in the
|
||||
middle of data loading or testing in OFBiz.
|
||||
|
||||
Warning: Be careful in using this command as force termination
|
||||
might lead to inconsistent state / data
|
||||
|
||||
`gradlew terminateOfbiz`
|
||||
|
||||
#### Start OFBiz in remote debug mode
|
||||
|
||||
Starts OFBiz in remote debug mode and waits for debugger
|
||||
or IDEs to connect on port __5005__
|
||||
|
||||
`gradlew "ofbizDebug --start"`
|
||||
|
||||
OR
|
||||
|
||||
`gradlew ofbizDebug`
|
||||
|
||||
#### Start OFBiz on a different port
|
||||
|
||||
Start OFBiz of the network port offsetted by the range
|
||||
provided in the argument to --portoffset
|
||||
|
||||
`gradlew "ofbiz --start --portoffset 10000"`
|
||||
|
||||
#### Start OFBiz in the background
|
||||
|
||||
Start OFBiz in the background by forking it to a new
|
||||
process and redirecting the output to __runtime/logs/console.log__
|
||||
|
||||
`gradlew "ofbizBackground --start"`
|
||||
|
||||
OR
|
||||
|
||||
`gradlew ofbizBackground`
|
||||
|
||||
You can also offset the port, for example:
|
||||
|
||||
`gradlew "ofbizBackground --start --portoffset 10000"`
|
||||
|
||||
#### Passing JVM runtime options to OFBiz
|
||||
|
||||
You can pass JVM runtime options by specifying the project property `-PjvmArgs`.
|
||||
|
||||
`gradlew ofbiz -PjvmArgs="-Xms1024M -Xmx2048M" -Dsome.parameter=hello`
|
||||
|
||||
If you do not specify `jvmArgs`, a default of `-Xms128M -Xmx1024M` is set.
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
### Data loading tasks
|
||||
|
||||
OFBiz contains the following data reader types:
|
||||
|
||||
- __seed__: OFBiz and External Seed Data - to be maintained along with source and
|
||||
updated whenever a system deployment is updated
|
||||
- __seed-initial__: OFBiz and External Seed Data - to be maintained along with
|
||||
source like other seed data, but only loaded initially and not updated
|
||||
when a system is updated except manually reviewing each line
|
||||
- __demo__: OFBiz Only Demo Data
|
||||
- __ext__: External General Data (custom)
|
||||
- __ext-test__: External Test Data (custom)
|
||||
- __ext-demo__: External Demo Data (custom)
|
||||
- __tenant__: Data to load into the master tenants database "ofbiztenant". This
|
||||
data is required to identify where a tenant's database is located. For more
|
||||
information you can review the relevant
|
||||
[tenant documentation](https://cwiki.apache.org/confluence/display/OFBIZ/Multitenancy+support)
|
||||
|
||||
Available options for the --load-data server command are the following:
|
||||
|
||||
- **readers=[name]**: only load data from certain readers separated by comma.
|
||||
e.g. seed,seed-initial,ext
|
||||
- **file=[path]**: load a single file from location or several files separated
|
||||
by commas. e.g. /my/file/1,/my/file/2
|
||||
- **dir=[path]**: load all data files found in directory
|
||||
- **component=[name]**: only load data from a specific component. e.g. base
|
||||
- **delegator=[name]**: use the defined delegator. Default is "default". If the
|
||||
value passed is **"all-tenants"** then OFBiz will load the data for all defined
|
||||
tenants in the system.
|
||||
- **group=[name]**: override the entity group (org.apache.ofbiz).
|
||||
e.g. com.example.something
|
||||
- **timeout=[millis]**: timeout in milliseconds
|
||||
- **create-pks**: create primary keys
|
||||
- **drop-pks**: drop primary keys
|
||||
- **create-constraints**: create indexes and foreign keys after loading
|
||||
- **drop-constraints**: drop indexes and foreign keys before loading
|
||||
- **create-fks**: create dummy (placeholder) foreign keys
|
||||
- **maintain-txs**: maintain timestamps in data file
|
||||
- **try-inserts**: use mostly inserts
|
||||
- **repair-columns**: repair column sizes
|
||||
(default is true w/ drop-constraints)
|
||||
- **continue-on-failure**: By default OFBiz will fail and stop if it is unable
|
||||
to load any of the files it is attempting to load. By passing this property
|
||||
OFBiz will ignore failures and continue loading all files
|
||||
|
||||
#### Load specific OFBiz data
|
||||
|
||||
you can choose which data readers to pass in the following syntax:
|
||||
|
||||
`gradlew "ofbiz --load-data readers=<readers-here-comma-separated>"`
|
||||
|
||||
Example:
|
||||
|
||||
`gradlew "ofbiz --load-data readers=seed,seed-initial,ext,ext-demo"`
|
||||
|
||||
<span style="color:red">
|
||||
Beware that copying this command in Microsoft Word will automatically transform the double dash in en dashes (Unicode 0x2013: –)
|
||||
Other cases not related to Word were also reported.So when this command does not work check that you are using dash!
|
||||
text</span>
|
||||
|
||||
#### Load all OFBiz data
|
||||
|
||||
Loads all data sets; meant for initial loading of generic OFBiz data.
|
||||
Can be applied for development, testing, demonstration, etc. purposes.
|
||||
Be aware that executing this task can result in your data being overwritten
|
||||
in your database of choice. Use with caution in production environments.
|
||||
|
||||
`gradlew loadAll`
|
||||
|
||||
OR
|
||||
|
||||
`gradlew "ofbiz --load-data"`
|
||||
|
||||
#### Load seed data
|
||||
|
||||
Load ONLY the seed data (not seed-initial, demo, ext* or anything else);
|
||||
meant for use after an update of the code to reload the seed data
|
||||
as it is generally maintained along with the code and needs to be
|
||||
in sync for operation
|
||||
|
||||
`gradlew "ofbiz --load-data readers=seed"`
|
||||
|
||||
#### load ext data
|
||||
|
||||
Load seed, seed-initial and ext data; meant for manual/generic
|
||||
testing, development, or going into production with a derived
|
||||
system based on stock OFBiz where the ext data basically
|
||||
replaces the demo data
|
||||
|
||||
`gradlew "ofbiz --load-data readers=seed,seed-initial,ext"`
|
||||
|
||||
#### load ext test data
|
||||
|
||||
Load seed, seed-initial, ext and ext-test data; meant for
|
||||
automated testing with a derived system based on stock OFBiz
|
||||
|
||||
`gradlew "ofbiz --load-data readers=seed,seed-initial,ext,ext-test"`
|
||||
|
||||
#### load data from an entity file
|
||||
|
||||
Load data from an XML file holding entity data.
|
||||
|
||||
`gradlew "ofbiz --load-data file=foo/bar/FileNameHere.xml"`
|
||||
|
||||
#### create a new tenant
|
||||
|
||||
Create a new tenant in your environment, create the delegator, load
|
||||
initial data with admin-user and password (needs multitenant=Y in
|
||||
general.properties). The following project parameters are passed:
|
||||
|
||||
- tenantId: mandatory
|
||||
- tenantName: optional, default is value of tenantId
|
||||
- domainName: optional, default is org.apache.ofbiz
|
||||
- tenantReaders: optional, default value is seed,seed-initial,demo
|
||||
- dbPlatform: optional, D(Derby), M(MySQL), O(Oracle), P(PostgreSQL) (default D)
|
||||
- dbIp: optional, ip address of the database
|
||||
- dbUser: optional, username of the database
|
||||
- dbPassword: optional, password of the database
|
||||
|
||||
`gradlew createTenant -PtenantId=mytenant`
|
||||
|
||||
`gradlew createTenant -PtenantId=mytenant -PtenantName="My Name" -PdomainName=com.example -PtenantReaders=seed,seed-initial,ext -PdbPlatform=M -PdbIp=127.0.0.1 -PdbUser=mydbuser -PdbPassword=mydbpass`
|
||||
|
||||
If run successfully, the system creates a new tenant having:
|
||||
|
||||
- delegator: default#${tenandId} (e.g. default#mytenant)
|
||||
- admin user: ${tenantId}-admin (e.g. mytenant-admin)
|
||||
- admin user password: ofbiz
|
||||
|
||||
#### load data for a specific tenant
|
||||
|
||||
Load data for one specific tenant in a multitenant environment. Note
|
||||
that you must set multitenant=Y in general.properties and the
|
||||
following project parameters are passed:
|
||||
|
||||
- tenantId (mandatory)
|
||||
- tenantReaders (optional)
|
||||
- tenantComponent (optional)
|
||||
|
||||
`gradlew loadTenant -PtenantId=mytenant`
|
||||
|
||||
`gradlew loadTenant -PtenantId=mytenant -PtenantReaders=seed,seed-initial,demo -PtenantComponent=base`
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
### Testing tasks
|
||||
|
||||
#### Execute all unit tests
|
||||
|
||||
`gradlew test`
|
||||
|
||||
#### Execute all integration tests
|
||||
|
||||
`gradlew testIntegration`
|
||||
|
||||
OR
|
||||
|
||||
`gradlew 'ofbiz --test'`
|
||||
|
||||
#### Execute integration tests with a different log level
|
||||
|
||||
It is possible to start integration tests with a log level different from the
|
||||
default one. The log levels allowed are listed below from most verbose to
|
||||
least verbose:
|
||||
|
||||
- always
|
||||
- verbose
|
||||
- timing
|
||||
- info
|
||||
- important
|
||||
- warning
|
||||
- error
|
||||
- fatal
|
||||
|
||||
`gradlew "ofbiz --test loglevel=fatal"`
|
||||
|
||||
#### Execute an integration test case
|
||||
|
||||
run a test case, in this example the component is "entity" and the case
|
||||
name is "entity-tests"
|
||||
|
||||
`gradlew "ofbiz --test component=entity --test suitename=entitytests --test case=entity-query-tests"`
|
||||
|
||||
#### Execute an integration test case in debug mode with verbose log
|
||||
|
||||
listens on port __5005__
|
||||
|
||||
`gradlew "ofbizDebug --test component=entity --test loglevel=verbose"`
|
||||
|
||||
#### Execute an integration test suite
|
||||
|
||||
`gradlew "ofbiz --test component=entity --test suitename=entitytests"`
|
||||
|
||||
#### Execute an integration test suite in debug mode
|
||||
|
||||
listens on port __5005__
|
||||
|
||||
`gradlew "ofbizDebug --test component=entity --test suitename=entitytests"`
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
### Miscellaneous tasks
|
||||
|
||||
#### Run all tests on a clean system
|
||||
|
||||
`gradlew cleanAll loadAll testIntegration`
|
||||
|
||||
#### Clean all generated artifacts
|
||||
|
||||
`gradlew cleanAll`
|
||||
|
||||
#### Refresh the generated artifacts
|
||||
|
||||
`gradlew clean build`
|
||||
|
||||
#### Create an admin user account
|
||||
|
||||
Create an admin user with login name MyUserName and default password
|
||||
with value "ofbiz". Upon first login OFBiz will request changing the
|
||||
default password
|
||||
|
||||
`gradlew loadAdminUserLogin -PuserLoginId=MyUserName`
|
||||
|
||||
#### Compile Java using Xlint output
|
||||
|
||||
Xlint prints output of all warnings detected by the compiler
|
||||
|
||||
`gradlew -PXlint build`
|
||||
|
||||
#### Run OWASP tool to identify dependency vulnerabilities (CVEs)
|
||||
|
||||
The below command activates a gradle plugin (OWASP) and Identifies
|
||||
and reports known vulnerabilities (CVEs) in OFBiz library dependencies.
|
||||
The task takes time to complete, and once done, a report will be generated in
|
||||
$OFBIZ_HOME/build/reports/dependency-check-report.html
|
||||
|
||||
`gradlew -PenableOwasp dependencyCheckAnalyze`
|
||||
|
||||
#### Setup eclipse project for OFBiz
|
||||
|
||||
Setting up OFBiz on eclipse is done by simply running the below command
|
||||
and then importing the project to eclipse. This command will generate
|
||||
the necessary __.classpath__ and __.project__ files for eclipse and it
|
||||
will also make the source code for external libraries available in
|
||||
eclipse (i.e. you can view source through Ctrl + Click)
|
||||
|
||||
The first time you run this command it will take a long time to execute
|
||||
because it will download source packages available for project
|
||||
dependencies.
|
||||
|
||||
`gradlew eclipse`
|
||||
|
||||
* * * * * * * * * * *
|
||||
|
||||
OFBiz plugin system
|
||||
-------------------
|
||||
|
||||
OFBiz provides an extension mechanism through plugins. Plugins are standard
|
||||
OFBiz components that reside in the plugins directory. Plugins can be
|
||||
added manually or fetched from a maven repository. The standard tasks for
|
||||
managing plugins are listed below.
|
||||
|
||||
>_Note_: OFBiz plugin versions follow [Semantic Versioning 2.0.0](http://semver.org/)
|
||||
|
||||
### Pull (download and install) a plugin automatically
|
||||
|
||||
Download a plugin with all its dependencies (plugins) and install them one-by-one
|
||||
starting with the dependencies and ending with the plugin itself.
|
||||
|
||||
`gradlew pullPlugin -PdependencyId="org.apache.ofbiz.plugin:myplugin:0.1.0"`
|
||||
|
||||
If the plugin resides in a custom maven repository (not jcenter or localhost) then
|
||||
you can use specify the repository using below command:
|
||||
|
||||
`gradlew pullPlugin -PrepoUrl="http://www.example.com/custom-maven" -PdependencyId="org.apache.ofbiz.plugin:myplugin:0.1.0"`
|
||||
|
||||
If you need username and password to access the custom repository:
|
||||
|
||||
`gradlew pullPlugin -PrepoUrl="http://www.example.com/custom-maven" -PrepoUser=myuser -PrepoPassword=mypassword -PdependencyId="org.apache.ofbiz.plugin:myplugin:0.1.0"`
|
||||
|
||||
### 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.
|
||||
|
||||
This task is mostly useful when working on the trunk branch
|
||||
as it pulls in the 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
|
||||
|
||||
Download all officially supported plugins from source control (currently subversion)
|
||||
and place them inclusive of their ".svn" directory in /plugins. WARNING! This task
|
||||
deletes the /plugins directory and replaces it with the official plugins.
|
||||
|
||||
`gradlew pullAllPluginsSource`
|
||||
|
||||
This task makes it easy to download and develop officially supported plugins. It is
|
||||
mostly used by developers or individuals working on the trunk branch. We do 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
|
||||
|
||||
If you have a plugin called mycustomplugin and want to install it in OFBiz follow the
|
||||
below instructions:
|
||||
|
||||
- Extract the plugin if it is compressed
|
||||
- Place the extracted directory into /plugins
|
||||
- Run the below command
|
||||
|
||||
`gradlew installPlugin -PpluginId=myplugin`
|
||||
|
||||
The above commands executes the task "install" in the plugin's build.gradle
|
||||
file if it exists
|
||||
|
||||
### Uninstall a plugin
|
||||
|
||||
If you have an existing plugin called mycustomplugin and you wish to uninstall
|
||||
run the below command
|
||||
|
||||
`gradlew uninstallPlugin -PpluginId=myplugin`
|
||||
|
||||
The above command executes the task "uninstall" in the plugin's build.gradle
|
||||
file if it exists
|
||||
|
||||
### Remove a plugin
|
||||
|
||||
Calls __uninstallPlugin__ on an existing plugin and then delete it from the file-system
|
||||
|
||||
`gradlew removePlugin -PpluginId=myplugin`
|
||||
|
||||
### Create a new plugin
|
||||
|
||||
Create a new plugin. The following project parameters are passed:
|
||||
|
||||
- pluginId: mandatory
|
||||
- pluginResourceName: optional, default is the Capitalized value of pluginId
|
||||
- webappName: optional, default is the value of pluginId
|
||||
- basePermission: optional, default is the UPPERCASE value of pluginId
|
||||
|
||||
`gradlew createPlugin -PpluginId=myplugin`
|
||||
|
||||
`gradlew createPlugin -PpluginId=myplugin -PpluginResourceName=MyPlugin -PwebappName=mypluginweb -PbasePermission=MYSECURITY`
|
||||
|
||||
The above command creates a new plugin in /plugins/myplugin
|
||||
|
||||
### Push a plugin to a repository
|
||||
|
||||
This task publishes an OFBiz plugin into a maven package and then uploads it to
|
||||
a maven repository. Currently, pushing is limited to localhost maven repository
|
||||
(work in progress). To push a plugin the following parameters are passed:
|
||||
|
||||
- pluginId: mandatory
|
||||
- groupId: optional, defaults to org.apache.ofbiz.plugin
|
||||
- pluginVersion: optional, defaults to 0.1.0-SNAPSHOT
|
||||
- pluginDescription: optional, defaults to "Publication of OFBiz plugin ${pluginId}"
|
||||
|
||||
`gradlew pushPlugin -PpluginId=myplugin`
|
||||
|
||||
`gradlew pushPlugin -PpluginId=mycompany -PpluginGroup=com.mycompany.ofbiz.plugin -PpluginVersion=1.2.3 -PpluginDescription="Introduce special functionality X"`
|
||||
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
Miscellaneous Documentation
|
||||
---------------------------
|
||||
### Further reading
|
||||
* [Known issues](https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-Knownissues "Known issues")
|
||||
|
||||
### Repository and directory structure
|
||||
|
||||
OFBiz is split into two repositories:
|
||||
|
||||
- **ofbiz-framework**: Contains the core framework and main applications in
|
||||
the system like accounting, party, order, etc
|
||||
|
||||
- **ofbiz-plugins**: Renamed from "special-purpose" and contains optional
|
||||
components that are officially supported by the community
|
||||
|
||||
Furthermore, the hot-deploy directory is removed as the plugins directory works
|
||||
as a replacement for both "special-purpose" and "hot-deploy".
|
||||
|
||||
If you need to load the components in the plugins directory in a specific order
|
||||
place a component-load.xml file in the plugins directory listing the order.
|
||||
|
||||
To check out a plugin from source control use the **pullPluginSource** Gradle task.
|
||||
To check out all plugins from source control use the **pullAllPluginsSource**.
|
||||
**Beware** this deletes a previously existing plugins directory.
|
||||
|
||||
### Running gradle tasks without an internet connection
|
||||
|
||||
OFBiz must run with an internet connection the **first time** it is prepared on
|
||||
the system because it needs to download all the required dependencies.
|
||||
|
||||
After preparing OFBiz the first time correctly, it is possible to run OFBiz
|
||||
without an internet connection by using the `--offline` command line switch
|
||||
which tells Gradle to fetch its dependencies from the cache.
|
||||
|
||||
If any dependencies are missing from the cache and you pass `--offline` switch
|
||||
then the build execution will fail.
|
||||
|
||||
### Setup an external database like MySQL, PostgreSQL, etc
|
||||
|
||||
To setup an external database instead of the default embedded Apache Derby, you
|
||||
will need to follow the following instructions:
|
||||
|
||||
1. Find the JDBC driver suitable for your database using one of the following
|
||||
options:
|
||||
* Search for the JDBC driver in [jcenter](https://bintray.com/bintray/jcenter)
|
||||
and place it in build.gradle dependencies e.g.
|
||||
`runtime 'mysql:mysql-connector-java:5.1.36'`
|
||||
|
||||
OR
|
||||
|
||||
* Download the JDBC driver jar and place it in $OFBIZ_HOME/lib or the lib
|
||||
sub-directory of any component
|
||||
|
||||
2. Modify the entityengine.xml file located in $OFBIZ_HOME/framework/entity/config
|
||||
to switch the default database to the one you selected. For more details you
|
||||
can read the relevant section in the
|
||||
[technical setup guide](https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Technical+Production+Setup+Guide)
|
||||
|
||||
### Setup gradle tab-completion on Unix-like systems:
|
||||
|
||||
To get tab completion (auto complete gradle commands by pressing tab)
|
||||
you can download the script from the below link and place it in the
|
||||
appropriate location for your system.
|
||||
|
||||
[Gradle tab completion](https://edub.me/gradle-completion-bash)
|
||||
|
||||
For example, on debian based systems, you can use the following command:
|
||||
|
||||
`sudo curl -L -s https://edub.me/gradle-completion-bash -o /etc/bash_completion.d/gradle-tab-completion.bash`
|
||||
|
||||
|
||||
* * * * * * * * * * * *
|
||||
|
||||
Crypto notice
|
||||
-------------
|
||||
|
||||
This distribution includes cryptographic software. The country in
|
||||
which you currently reside may have restrictions on the import,
|
||||
possession, use, and/or re-export to another country, of
|
||||
encryption software. BEFORE using any encryption software, please
|
||||
check your country's laws, regulations and policies concerning the
|
||||
import, possession, or use, and re-export of encryption software, to
|
||||
see if this is permitted. See <http://www.wassenaar.org/> for more
|
||||
information.
|
||||
|
||||
The U.S. Government Department of Commerce, Bureau of Industry and
|
||||
Security (BIS), has classified this software as Export Commodity
|
||||
Control Number (ECCN) 5D002.C.1, which includes information security
|
||||
software using or performing cryptographic functions with asymmetric
|
||||
algorithms. The form and manner of this Apache Software Foundation
|
||||
distribution makes it eligible for export under the License Exception
|
||||
ENC Technology Software Unrestricted (TSU) exception (see the BIS
|
||||
Export Administration Regulations, Section 740.13) for both object
|
||||
code and source code.
|
||||
|
||||
The following provides more details on the included cryptographic
|
||||
software:
|
||||
|
||||
- Various classes in OFBiz, including DesCrypt, HashCrypt, and
|
||||
BlowFishCrypt use libraries from the Sun Java JDK API including
|
||||
java.security.* and javax.crypto.* (the JCE, Java Cryptography
|
||||
Extensions API)
|
||||
- Other classes such as HttpClient and various related ones use
|
||||
the JSSE (Java Secure Sockets Extension) API
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="AcctgTransType.description.AMORTIZATION">
|
||||
<value xml:lang="ar">الإطفاء</value>
|
||||
<value xml:lang="de">Amortisation</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="AccountingCheckAccountCannotBeUpdated">
|
||||
<value xml:lang="en">ERROR: Could not update Check Account.</value>
|
||||
</property>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="AccountingAccount">
|
||||
<value xml:lang="ar">حساب</value>
|
||||
<value xml:lang="cs">Účet</value>
|
||||
|
||||
@@ -33,7 +33,7 @@ under the License.
|
||||
organizationPartyId="Company" ownerPartyId="Company" postToGlAccountId="231000" isRefundable="Y" replenishLevel="0.00" actualBalance="0.00" availableBalance="0.00"/>
|
||||
<FinAccountStatus finAccountId="AMEX_01" statusId="FNACT_ACTIVE" statusDate="2009-04-01 00:00:01.000"/>
|
||||
<PaymentMethod paymentMethodId="AMEX_01" paymentMethodTypeId="CREDIT_CARD" partyId="Company" description="AmEx 0005" glAccountId="231000" finAccountId="AMEX_01" fromDate="2009-04-01 00:00:00.000"/>
|
||||
<CreditCard paymentMethodId="AMEX_01" cardType="CCT_AMERICANEXPRESS" cardNumber="378282246310005" expireDate="02/2020" companyNameOnCard="Your Company Name"
|
||||
<CreditCard paymentMethodId="AMEX_01" cardType="CCT_AMERICANEXPRESS" cardNumber="378282246310005" expireDate="02/2120" companyNameOnCard="Your Company Name"
|
||||
titleOnCard="" firstNameOnCard="Smart" middleNameOnCard="" lastNameOnCard="Guy" suffixOnCard="" contactMechId="9000"/>
|
||||
<PaymentMethod paymentMethodId="PETTY_CASH" paymentMethodTypeId="CASH" partyId="Company" description="Petty Cash" glAccountId="110000" fromDate="2009-04-01 00:00:00.000"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
-->
|
||||
|
||||
<entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
|
||||
<!-- To maintain FinAccount.actualBalance and FinAccount.availableBalance -->
|
||||
<eca entity="FinAccountTrans" operation="create-store" event="return">
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<!-- ========================================================= -->
|
||||
<!-- ======================== Defaults ======================= -->
|
||||
<!-- ========================================================= -->
|
||||
|
||||
@@ -78,8 +78,8 @@ under the License.
|
||||
<!-- TODO: somehow determine if this is an order placed against the account or some other type of withdrawal -->
|
||||
<!-- TODO: handle order placed against (paid for with) the account -->
|
||||
|
||||
<set field="quickCreateAcctgTransAndEntries.debitGlAccountId" from-field="glAccountId"/>
|
||||
<set field="quickCreateAcctgTransAndEntries.creditGlAccountId" from-field="parameters.glAccountId"/>
|
||||
<set field="quickCreateAcctgTransAndEntries.debitGlAccountId" from-field="parameters.glAccountId"/>
|
||||
<set field="quickCreateAcctgTransAndEntries.creditGlAccountId" from-field="glAccountId"/>
|
||||
<set field="quickCreateAcctgTransAndEntries.acctgTransTypeId" value="PAYMENT_ACCTG_TRANS"/>
|
||||
</then>
|
||||
</else-if>
|
||||
@@ -89,6 +89,12 @@ under the License.
|
||||
<!-- if positive will go to one account for write-off, if negative will go to another account for a fee -->
|
||||
<!-- these will reverse depending on positive/negative amount -->
|
||||
<if-compare field="finAccountTrans.amount" operator="less" value="0">
|
||||
<calculate field="quickCreateAcctgTransAndEntries.amount" decimal-scale="${ledgerDecimals}" rounding-mode="${roundingMode}">
|
||||
<calcop operator="multiply">
|
||||
<calcop operator="get" field="quickCreateAcctgTransAndEntries.amount"/>
|
||||
<number value="-1"/>
|
||||
</calcop>
|
||||
</calculate>
|
||||
<set field="quickCreateAcctgTransAndEntries.debitGlAccountId" from-field="parameters.glAccountId"/>
|
||||
<set field="quickCreateAcctgTransAndEntries.creditGlAccountId" from-field="glAccountId"/>
|
||||
<set field="quickCreateAcctgTransAndEntries.acctgTransTypeId" value="OUTGOING_PAYMENT"/>
|
||||
|
||||
@@ -70,7 +70,8 @@ under the License.
|
||||
<field-map field-name="finAccountId" value="1002"/>
|
||||
</entity-one>
|
||||
<assert>
|
||||
<if-empty field="finAccount"/>
|
||||
<not><if-empty field="finAccount"/></not>
|
||||
<not><if-empty field="finAccount.thruDate"/></not>
|
||||
</assert>
|
||||
<check-errors/>
|
||||
</simple-method>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="accounting"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-group xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-group.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-group.xsd">
|
||||
|
||||
<group name="createCreditCardAndAddress" send-mode="all">
|
||||
<invoke name="createPostalAddress" mode="sync" result-to-context="true"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
|
||||
<eca service="createPaymentApplication" event="commit">
|
||||
<condition field-name="invoiceId" operator="is-not-empty"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
|
||||
<!-- On cancelling invoice reverse its Accounting Transactions -->
|
||||
<eca service="cancelInvoice" event="invoke">
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
|
||||
<!-- this eca automatically posts the accounting transactions to GL -->
|
||||
<eca service="createAcctgTransAndEntries" event="commit">
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
|
||||
<!-- these SECAs are for automatically creating accounting transactions based on business transactions.
|
||||
They should normally be "sync" SECAs so that they happen as soon
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services - Miscellaneous</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services: Agreements </description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services: Budget</description>
|
||||
<vendor>Apache OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Clear Commerce Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Cost Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services: Financial Account</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
@@ -48,7 +48,7 @@ under the License.
|
||||
<attribute name="replenishPaymentId" type="String" mode="OUT" optional="true"/>
|
||||
<attribute name="replenishLevel" type="BigDecimal" mode="OUT" optional="true"/>
|
||||
</service>
|
||||
<service name="deleteFinAccount" default-entity-name="FinAccount" engine="entity-auto" invoke="delete">
|
||||
<service name="deleteFinAccount" default-entity-name="FinAccount" engine="entity-auto" invoke="expire">
|
||||
<description>Delete a Financial Account</description>
|
||||
<auto-attributes mode="IN" optional="false" include="pk"/>
|
||||
</service>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services: Fixed Asset </description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
@@ -556,7 +556,7 @@ under the License.
|
||||
<attribute name="customTimePeriodId" mode="IN" type="String"/>
|
||||
<attribute name="previousTimePeriod" mode="OUT" type="Map" optional="true"/>
|
||||
</service>
|
||||
<service name="getAcctgTransEntriesAndTransTotal" engine="simple" invoke="getAcctgTransEntriesAndTransTotal"
|
||||
<service name="getAcctgTransEntriesAndTransTotal" engine="simple" invoke="getAcctgTransEntriesAndTransTotal"
|
||||
location="component://accounting/minilang/ledger/AcctgTransServices.xml" auth="true">
|
||||
<description>Given AcctgTransAndEntire and Calculate acctg trans total for specific time period.</description>
|
||||
<attribute name="customTimePeriodStartDate" mode="IN" type="Timestamp"/>
|
||||
@@ -581,7 +581,7 @@ under the License.
|
||||
<attribute name="debitCreditDifference" type="BigDecimal" mode="OUT"/>
|
||||
</service>
|
||||
|
||||
<service name="revertAcctgTransOnCancelInvoice" engine="simple"
|
||||
<service name="revertAcctgTransOnCancelInvoice" engine="simple"
|
||||
location="component://accounting/minilang/ledger/AcctgTransServices.xml" invoke="revertAcctgTransOnCancelInvoice" auth="true">
|
||||
<description>Reverting Accounting Transaction And Entries on Canceling an Invoice</description>
|
||||
<attribute name="invoiceId" mode="IN" type="String" optional="false"/>
|
||||
@@ -589,7 +589,7 @@ under the License.
|
||||
<service name="revertAcctgTransOnRemovePaymentApplications" engine="simple"
|
||||
location="component://accounting/minilang/ledger/AcctgTransServices.xml" invoke="revertAcctgTransOnRemovePaymentApplications" auth="true">
|
||||
<description>Create Reverse Accounting Transaction and Entries on removing PaymentApplication records.</description>
|
||||
<attribute name="paymentApplicationId" mode="IN" type="String" optional="false"/>
|
||||
<attribute name="paymentApplicationId" mode="IN" type="String" optional="false"/>
|
||||
</service>
|
||||
|
||||
<service name="createGlAccountCategory" engine="entity-auto" default-entity-name="GlAccountCategory" invoke="create" auth="true">
|
||||
@@ -656,7 +656,7 @@ under the License.
|
||||
<attribute name="oldStatusId" type="String" mode="OUT" optional="true"/>
|
||||
</service>
|
||||
|
||||
<service name="createUpdateCostCenter" engine="java" auth="true" invoke="createUpdateCostCenter"
|
||||
<service name="createUpdateCostCenter" engine="java" auth="true" invoke="createUpdateCostCenter"
|
||||
location="org.apache.ofbiz.accounting.ledger.GeneralLedgerServices">
|
||||
<description>Create Update CostCenters</description>
|
||||
<attribute name="glAccountId" mode="IN" type="String"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>OrbitalGateway Services</description>
|
||||
<vendor></vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Payment Gateway Config Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>PayPal Services</description>
|
||||
|
||||
<service name="payPalSetExpressCheckout" engine="java"
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Permission Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services: Rate and related services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services: TaxAuthority and related </description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Accounting Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
+105
-45
@@ -23,6 +23,7 @@ import java.math.BigInteger;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.InvalidAlgorithmParameterException;
|
||||
import java.security.InvalidKeyException;
|
||||
import java.security.Key;
|
||||
import java.security.KeyFactory;
|
||||
import java.security.KeyPair;
|
||||
import java.security.KeyPairGenerator;
|
||||
@@ -59,7 +60,9 @@ import javax.crypto.spec.DHPrivateKeySpec;
|
||||
import javax.crypto.spec.DHPublicKeySpec;
|
||||
import javax.crypto.spec.IvParameterSpec;
|
||||
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.GeneralException;
|
||||
import org.apache.ofbiz.base.util.HttpClient;
|
||||
import org.apache.ofbiz.base.util.HttpClientException;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
@@ -154,14 +157,23 @@ public class ValueLinkApi {
|
||||
* @return Hex String of the encrypted pin (EAN) for transmission to ValueLink
|
||||
*/
|
||||
public String encryptPin(String pin) {
|
||||
byte[] rawIv = new byte[8];
|
||||
SecureRandom random = new SecureRandom();
|
||||
random.nextBytes(rawIv);
|
||||
IvParameterSpec iv = new IvParameterSpec(rawIv);
|
||||
// get the Cipher
|
||||
Cipher mwkCipher = this.getCipher(this.getMwkKey(), Cipher.ENCRYPT_MODE);
|
||||
Cipher mwkCipher = null;
|
||||
try {
|
||||
mwkCipher = getCipher(this.getMwkKey(), Cipher.ENCRYPT_MODE, iv);
|
||||
} catch (GeneralException e1) {
|
||||
Debug.logError(e1, module);
|
||||
}
|
||||
|
||||
// pin to bytes
|
||||
byte[] pinBytes = pin.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
// 7 bytes of random data
|
||||
byte[] random = this.getRandomBytes(7);
|
||||
byte[] randomBytes = this.getRandomBytes(7);
|
||||
|
||||
// pin checksum
|
||||
byte[] checkSum = this.getPinCheckSum(pinBytes);
|
||||
@@ -169,8 +181,8 @@ public class ValueLinkApi {
|
||||
// put all together
|
||||
byte[] eanBlock = new byte[16];
|
||||
int i;
|
||||
for (i = 0; i < random.length; i++) {
|
||||
eanBlock[i] = random[i];
|
||||
for (i = 0; i < randomBytes.length; i++) {
|
||||
eanBlock[i] = randomBytes[i];
|
||||
}
|
||||
eanBlock[7] = checkSum[0];
|
||||
for (i = 0; i < pinBytes.length; i++) {
|
||||
@@ -200,11 +212,26 @@ public class ValueLinkApi {
|
||||
/**
|
||||
* Decrypt an encrypted pin using the configured keys
|
||||
* @param pin Hex String of the encrypted pin (EAN)
|
||||
* @return Plain text String of the pin
|
||||
* @return Plain text String of the pin @
|
||||
*/
|
||||
public String decryptPin(String pin) {
|
||||
// get the Cipher
|
||||
Cipher mwkCipher = this.getCipher(this.getMwkKey(), Cipher.DECRYPT_MODE);
|
||||
// separate prefix with IV from the rest of encrypted data
|
||||
byte[] encryptedPayload = Base64.decodeBase64(pin.getBytes());
|
||||
byte[] iv = new byte[8];
|
||||
byte[] encryptedBytes = new byte[encryptedPayload.length - iv.length];
|
||||
|
||||
// populate iv with bytes:
|
||||
System.arraycopy(encryptedPayload, 0, iv, 0, iv.length);
|
||||
|
||||
// populate encryptedBytes with bytes:
|
||||
System.arraycopy(encryptedPayload, iv.length, encryptedBytes, 0, encryptedBytes.length);
|
||||
|
||||
Cipher mwkCipher = null;
|
||||
try {
|
||||
mwkCipher = getCipher(getMwkKey(), Cipher.ENCRYPT_MODE, new IvParameterSpec(iv));
|
||||
} catch (GeneralException e1) {
|
||||
Debug.logError(e1, module);
|
||||
}
|
||||
|
||||
// decrypt pin
|
||||
String decryptedPinString = null;
|
||||
@@ -271,7 +298,7 @@ public class ValueLinkApi {
|
||||
}
|
||||
|
||||
/**
|
||||
* Output the creation of public/private keys + KEK to the console for manual database update
|
||||
* Output the creation of public/private keys + KEK to the console for manual database update @
|
||||
*/
|
||||
public StringBuffer outputKeyCreation(boolean kekOnly, String kekTest) {
|
||||
return this.outputKeyCreation(0, kekOnly, kekTest);
|
||||
@@ -340,8 +367,18 @@ public class ValueLinkApi {
|
||||
byte[] loadKekBytes = loadedKek.getEncoded();
|
||||
|
||||
// test the KEK
|
||||
Cipher cipher = this.getCipher(this.getKekKey(), Cipher.ENCRYPT_MODE);
|
||||
byte[] kekTestB = { 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
byte[] rawIv = new byte[8];
|
||||
SecureRandom secRandom = new SecureRandom();
|
||||
secRandom.nextBytes(rawIv);
|
||||
IvParameterSpec iv = new IvParameterSpec(rawIv);
|
||||
|
||||
Cipher cipher = null;
|
||||
try {
|
||||
cipher = getCipher(this.getKekKey(), Cipher.ENCRYPT_MODE, iv);
|
||||
} catch (GeneralException e1) {
|
||||
Debug.logError(e1, module);
|
||||
}
|
||||
byte[] kekTestB = {0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
byte[] kekTestC = new byte[0];
|
||||
if (kekTest != null) {
|
||||
kekTestB = StringUtil.fromHexString(kekTest);
|
||||
@@ -496,7 +533,7 @@ public class ValueLinkApi {
|
||||
|
||||
/**
|
||||
* Generate a new MWK
|
||||
* @return Hex String of the new encrypted MWK ready for transmission to ValueLink
|
||||
* @return Hex String of the new encrypted MWK ready for transmission to ValueLink @
|
||||
*/
|
||||
public byte[] generateMwk() {
|
||||
KeyGenerator keyGen = null;
|
||||
@@ -535,7 +572,7 @@ public class ValueLinkApi {
|
||||
/**
|
||||
* Generate a new MWK
|
||||
* @param desBytes byte array of the DES key (24 bytes)
|
||||
* @return Hex String of the new encrypted MWK ready for transmission to ValueLink
|
||||
* @return Hex String of the new encrypted MWK ready for transmission to ValueLink @
|
||||
*/
|
||||
public byte[] generateMwk(byte[] desBytes) {
|
||||
if (debug) {
|
||||
@@ -570,7 +607,7 @@ public class ValueLinkApi {
|
||||
/**
|
||||
* Generate a new MWK
|
||||
* @param mwkdes3 pre-generated DES3 SecretKey
|
||||
* @return Hex String of the new encrypted MWK ready for transmission to ValueLink
|
||||
* @return Hex String of the new encrypted MWK ready for transmission to ValueLink @
|
||||
*/
|
||||
public byte[] generateMwk(SecretKey mwkdes3) {
|
||||
// zeros for checksum
|
||||
@@ -581,9 +618,18 @@ public class ValueLinkApi {
|
||||
Random ran = new SecureRandom();
|
||||
ran.nextBytes(random);
|
||||
|
||||
byte[] rawIv = new byte[8];
|
||||
SecureRandom secRandom = new SecureRandom();
|
||||
secRandom.nextBytes(rawIv);
|
||||
IvParameterSpec iv = new IvParameterSpec(rawIv);
|
||||
|
||||
// open a cipher using the new mwk
|
||||
Cipher cipher = this.getCipher(mwkdes3, Cipher.ENCRYPT_MODE);
|
||||
Cipher cipher = null;
|
||||
try {
|
||||
cipher = getCipher(mwkdes3, Cipher.ENCRYPT_MODE, iv);
|
||||
} catch (GeneralException e1) {
|
||||
Debug.logError(e1, module);
|
||||
}
|
||||
|
||||
// make the checksum - encrypted 8 bytes of 0's
|
||||
byte[] encryptedZeros = new byte[0];
|
||||
@@ -617,7 +663,12 @@ public class ValueLinkApi {
|
||||
* @return encrypted byte array
|
||||
*/
|
||||
public byte[] encryptViaKek(byte[] content) {
|
||||
return cryptoViaKek(content, Cipher.ENCRYPT_MODE);
|
||||
try {
|
||||
return cryptoViaKek(content, Cipher.ENCRYPT_MODE);
|
||||
} catch (GeneralException e1) {
|
||||
Debug.logError(e1, module);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -626,7 +677,12 @@ public class ValueLinkApi {
|
||||
* @return decrypted byte array
|
||||
*/
|
||||
public byte[] decryptViaKek(byte[] content) {
|
||||
return cryptoViaKek(content, Cipher.DECRYPT_MODE);
|
||||
try {
|
||||
return cryptoViaKek(content, Cipher.DECRYPT_MODE);
|
||||
} catch (GeneralException e1) {
|
||||
Debug.logError(e1, module);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -772,46 +828,50 @@ public class ValueLinkApi {
|
||||
return dhParamSpec;
|
||||
}
|
||||
|
||||
// actual kek encryption/decryption code
|
||||
protected byte[] cryptoViaKek(byte[] content, int mode) {
|
||||
/**
|
||||
* actual kek encryption/decryption code
|
||||
* @throws GeneralException
|
||||
*/
|
||||
protected byte[] cryptoViaKek(byte[] content, int mode) throws GeneralException {
|
||||
// open a cipher using the kek for transport
|
||||
Cipher cipher = this.getCipher(this.getKekKey(), mode);
|
||||
byte[] dec = new byte[0];
|
||||
byte[] rawIv = new byte[8];
|
||||
SecureRandom random = new SecureRandom();
|
||||
random.nextBytes(rawIv);
|
||||
IvParameterSpec iv = new IvParameterSpec(rawIv);
|
||||
|
||||
// Create the Cipher - DESede/CBC/PKCS5Padding
|
||||
byte[] encBytes = null;
|
||||
Cipher cipher = getCipher(getKekKey(), mode, iv);
|
||||
try {
|
||||
dec = cipher.doFinal(content);
|
||||
} catch (IllegalStateException e) {
|
||||
Debug.logError(e, module);
|
||||
} catch (IllegalBlockSizeException e) {
|
||||
Debug.logError(e, module);
|
||||
} catch (BadPaddingException e) {
|
||||
encBytes = cipher.doFinal(content);
|
||||
} catch (IllegalStateException | BadPaddingException | IllegalBlockSizeException e) {
|
||||
Debug.logError(e, module);
|
||||
}
|
||||
return dec;
|
||||
// Prepend iv as a prefix to use it during decryption
|
||||
byte[] combinedPayload = new byte[rawIv.length + encBytes.length];
|
||||
|
||||
// populate payload with prefix iv and encrypted data
|
||||
System.arraycopy(iv, 0, combinedPayload, 0, rawIv.length);
|
||||
System.arraycopy(cipher, 0, combinedPayload, 8, encBytes.length);
|
||||
|
||||
return encBytes;
|
||||
}
|
||||
|
||||
// return a cipher for a key - DESede/CBC/NoPadding IV = 0
|
||||
protected Cipher getCipher(SecretKey key, int mode) {
|
||||
byte[] zeros = { 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
IvParameterSpec iv = new IvParameterSpec(zeros);
|
||||
|
||||
// return a cipher for a key - DESede/CBC/NoPadding with random IV
|
||||
protected static Cipher getCipher(Key key, int mode, IvParameterSpec iv) throws GeneralException {
|
||||
// create the Cipher - DESede/CBC/NoPadding
|
||||
Cipher mwkCipher = null;
|
||||
Cipher cipher = null;
|
||||
try {
|
||||
mwkCipher = Cipher.getInstance("DESede/CBC/NoPadding");
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
Debug.logError(e, module);
|
||||
return null;
|
||||
} catch (NoSuchPaddingException e) {
|
||||
Debug.logError(e, module);
|
||||
cipher = Cipher.getInstance("DESede/CBC/NoPadding");
|
||||
} catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
|
||||
throw new GeneralException(e);
|
||||
}
|
||||
try {
|
||||
mwkCipher.init(mode, key, iv);
|
||||
} catch (InvalidKeyException e) {
|
||||
Debug.logError(e, "Invalid key", module);
|
||||
} catch (InvalidAlgorithmParameterException e) {
|
||||
Debug.logError(e, module);
|
||||
cipher.init(mode, key, iv);
|
||||
} catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
|
||||
throw new GeneralException(e);
|
||||
}
|
||||
return mwkCipher;
|
||||
return cipher;
|
||||
}
|
||||
|
||||
protected byte[] getPinCheckSum(byte[] pinBytes) {
|
||||
|
||||
@@ -298,6 +298,11 @@ under the License.
|
||||
<input type="text" size='14' name='fromDate' />
|
||||
<span class="label">${uiLabelMap.CommonThruDate}</span>
|
||||
<input type="text" size='14' name='thruDate' />
|
||||
<span class="label">${uiLabelMap.FormFieldTitle_isClosed}:</span>
|
||||
<select name="isClosed">
|
||||
<option value="N">${uiLabelMap.CommonN}</option>
|
||||
<option value="Y">${uiLabelMap.CommonY}</option>
|
||||
</select>
|
||||
<input type="submit" value="${uiLabelMap.CommonAdd}" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<test-suite suite-name="accountingtests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="accounting-tests-data-load">
|
||||
<entity-xml action="load" entity-xml-url="component://accounting/testdef/data/AccountingTestsData.xml"/>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<test-suite suite-name="fixedassettests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="fixedasset-tests">
|
||||
<simple-method-test location="component://accounting/minilang/test/FixedAssetTests.xml"/>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<test-suite suite-name="invoicetests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="auto-invoice-tests">
|
||||
<simple-method-test location="component://accounting/minilang/test/AutoInvoiceTests.xml"/>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<test-suite suite-name="paymentappltests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="application-tests-data-load">
|
||||
<entity-xml action="load" entity-xml-url="component://accounting/testdef/data/PaymentApplicationTestsData.xml"/>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<test-suite suite-name="paymenttests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
|
||||
<test-case case-name="auto-payment-tests">
|
||||
<simple-method-test location="component://accounting/minilang/test/AutoPaymentTests.xml"/>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<test-suite suite-name="ratetests"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd">
|
||||
<test-case case-name="rate-tests-data-load">
|
||||
<entity-xml action="load" entity-xml-url="component://accounting/testdef/data/RateTestsData.xml"/>
|
||||
</test-case>
|
||||
|
||||
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<web-app version="3.0">
|
||||
<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 - Accounting Manager</display-name>
|
||||
<description>Accounting Manager Module of the Apache OFBiz Project</description>
|
||||
|
||||
@@ -62,6 +62,11 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
|
||||
</filter>
|
||||
<filter>
|
||||
<display-name>SameSiteFilter</display-name>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>ControlFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
@@ -70,6 +75,10 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
<filter-mapping>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
|
||||
|
||||
@@ -15,7 +15,7 @@ KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<web-app version="3.0">
|
||||
<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 - Account Payable</display-name>
|
||||
<description>Accounting Payable Module of the Apache OFBiz Project</description>
|
||||
|
||||
@@ -58,6 +58,11 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
|
||||
</filter>
|
||||
<filter>
|
||||
<display-name>SameSiteFilter</display-name>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>ControlFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
@@ -66,6 +71,10 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
<filter-mapping>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
|
||||
<!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
|
||||
|
||||
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<web-app version="3.0">
|
||||
<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 - Account Receivable</display-name>
|
||||
<description>Accounting Receivable Module of the Apache OFBiz Project</description>
|
||||
|
||||
@@ -62,6 +62,11 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
|
||||
</filter>
|
||||
<filter>
|
||||
<display-name>SameSiteFilter</display-name>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>ControlFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
@@ -70,6 +75,10 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
<filter-mapping>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
|
||||
|
||||
@@ -165,7 +165,7 @@ under the License.
|
||||
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
|
||||
<form name="ListPayment" list-name="listIt" title="" paginate-target="LookupPayment"
|
||||
<form name="ListPayment" list-name="listIt" title="" type="list" paginate-target="LookupPayment"
|
||||
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
|
||||
<actions>
|
||||
<service service-name="performFind" result-map="result" result-map-list="listIt">
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<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">
|
||||
|
||||
<form name="FindFinAccounts" type="single" target="FindFinAccount"
|
||||
@@ -73,7 +73,7 @@ under the License.
|
||||
<parameter param-name="partyId" from-field="ownerPartyId"/>
|
||||
</hyperlink>
|
||||
</field>
|
||||
<field name="deleteLink" title=" " widget-style="buttontext">
|
||||
<field name="deleteLink" title=" " widget-style="buttontext" use-when="thruDate==null">
|
||||
<hyperlink description="${uiLabelMap.CommonDelete}" target="deleteFinAccount" also-hidden="false">
|
||||
<parameter param-name="finAccountId"/>
|
||||
</hyperlink>
|
||||
@@ -336,7 +336,7 @@ under the License.
|
||||
<field name="glReconciliationId" position="2">
|
||||
<drop-down allow-empty="true">
|
||||
<option key="_NA_" description="${uiLabelMap.CommonNotAssigned}"/>
|
||||
<list-options list-name="glReconciliations" key-name="glReconciliationId"
|
||||
<list-options list-name="glReconciliations" key-name="glReconciliationId"
|
||||
description="${glReconciliationName}[[${glReconciliationId}] [${reconciledDate}] [${reconciledBalance}]]"/>
|
||||
</drop-down>
|
||||
</field>
|
||||
@@ -346,17 +346,17 @@ under the License.
|
||||
<field name="thruEntryDate" position="2"><date-time/></field>
|
||||
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
</form>
|
||||
<form name="FindBankReconciliationFinAcctTrans" target="BankReconciliation"
|
||||
<form name="FindBankReconciliationFinAcctTrans" target="BankReconciliation"
|
||||
extends="FindFinAccountTransactions">
|
||||
<field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
|
||||
<field name="glReconciliationId" position="2">
|
||||
<drop-down>
|
||||
<list-options list-name="glReconciliations" key-name="glReconciliationId"
|
||||
<list-options list-name="glReconciliations" key-name="glReconciliationId"
|
||||
description="${glReconciliationName}[[${glReconciliationId}] [${reconciledDate}] [${reconciledBalance}]]"/>
|
||||
</drop-down>
|
||||
</field>
|
||||
</form>
|
||||
<form name="EditDepositPayment" extends="EditPayment"
|
||||
<form name="EditDepositPayment" extends="EditPayment"
|
||||
extends-resource="component://accounting/widget/PaymentForms.xml" target="createDepositPayment">
|
||||
<actions>
|
||||
<entity-one entity-name="FinAccount" value-field="finAccount"/>
|
||||
@@ -400,12 +400,8 @@ under the License.
|
||||
</actions>
|
||||
<alt-target use-when="glReconciliationId != null" target="updateFinAccountGlReconciliation"/>
|
||||
<field name="finAccountId"><hidden value="${finAccountId}"/></field>
|
||||
<field name="glReconciliationId" use-when="glReconciliationId == null"><ignored/></field>
|
||||
<field name="glReconciliationId" use-when="glReconciliationId != null"><display/></field>
|
||||
<field name="glAccountId"><hidden value="${finAccount.postToGlAccountId}"/></field>
|
||||
<field name="organizationPartyId"><lookup target-form-name="LookupPartyName"/></field>
|
||||
<field name="reconciledBalance" use-when="${reconciledBalance == null}"><hidden/></field>
|
||||
<field name="reconciledBalance" use-when=""GLREC_RECONCILED".equals("${glReconciliation.statusId}")"><display type="currency" currency="${defaultOrganizationPartyCurrencyUomId}"/></field>
|
||||
<field name="reconciledDate" title="${uiLabelMap.AccountingReconciliationDate}"><date-time/></field>
|
||||
<field name="createButton" use-when="glReconciliationId == null" widget-style="smallSubmit">
|
||||
<submit button-type="button"/>
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<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">
|
||||
|
||||
<form name="FindAcctgTrans" target="FindAcctgTrans" type="single" title="" default-map-name="journal"
|
||||
@@ -763,7 +763,7 @@ under the License.
|
||||
<field name="description"><textarea/></field>
|
||||
<field name="createButton" widget-style="smallSubmit"><submit button-type="button"/></field>
|
||||
<sort-order>
|
||||
<sort-field name="organizationPartyId"/>
|
||||
<sort-field name="organizationPartyId"/>
|
||||
<sort-field name="acctgTransTypeId"/>
|
||||
<sort-field name="glFiscalTypeId"/>
|
||||
<sort-field name="glJournalId"/>
|
||||
@@ -861,7 +861,7 @@ under the License.
|
||||
</field>
|
||||
<field name="reconciledDate"><date-time/></field>
|
||||
<field name="organizationPartyId"><display/></field>
|
||||
<field name="reconciledBalance"><display/></field>
|
||||
<field name="reconciledBalance" use-when=""GLREC_RECONCILED".equals("${glReconciliation.statusId}")"><display type="currency" currency="${defaultOrganizationPartyCurrencyUomId}"/></field>
|
||||
<field name="openingBalance" use-when="${groovy:'GLREC_RECONCILED'.equals(glReconciliation?.statusId)}"><display/></field>
|
||||
<field use-when="glReconciliationId!=null" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit button-type="text-link"/></field>
|
||||
</form>
|
||||
|
||||
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
<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">
|
||||
|
||||
<form name="ListCompanies" type="list" title="Internal Organizations" list-name="parties"
|
||||
@@ -370,7 +370,7 @@ under the License.
|
||||
</field>
|
||||
<field name="errorGlJournalId" tooltip="${groovy: import org.apache.ofbiz.base.util.UtilProperties;
|
||||
if((partyAcctgPreference==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null) ||
|
||||
(partyAcctgPreference!=null&&partyAcctgPreference.get('errorGlJournalId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null))return
|
||||
(partyAcctgPreference!=null&&partyAcctgPreference.get('errorGlJournalId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('errorGlJournalId')!=null))return
|
||||
(UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
|
||||
<drop-down allow-empty="true">
|
||||
<entity-options entity-name="GlJournal" key-field-name="glJournalId" description="${glJournalName} [${glJournalId}]">
|
||||
@@ -1103,7 +1103,7 @@ under the License.
|
||||
<field name="glAccountClassId"><display-entity entity-name="GlAccountClass" key-field-name="glAccountClassId"/></field>
|
||||
<field name="glResourceTypeId"><display-entity entity-name="GlResourceType" key-field-name="glResourceTypeId"/></field>
|
||||
<field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass" key-field-name="glXbrlClassId"/></field>
|
||||
<field name="parentGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${parentGlAccountId}"/></field>
|
||||
<field name="parentGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${parentGlAccountId}"/></field>
|
||||
<field name="accountCode" ><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode}"/></field>
|
||||
<field name="accountName" ><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/></field>
|
||||
<field name="description"><display description="${description}"/></field>
|
||||
|
||||
@@ -69,10 +69,8 @@ under the License.
|
||||
<field-map field-name="compareDate" from-field="invoiceDate"/>
|
||||
<field-map field-name="lastNameFirst" value="Y"/>
|
||||
</service>
|
||||
<set field="amountToApply" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)
|
||||
.multiply(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/>
|
||||
<set field="total" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)
|
||||
.multiply(org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/>
|
||||
<set field="amountToApply" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)}"/>
|
||||
<set field="total" value="${groovy:org.apache.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)}"/>
|
||||
</row-actions>
|
||||
|
||||
<field name="invoiceId" widget-style="buttontext" sort-field="true">
|
||||
|
||||
@@ -891,6 +891,11 @@ under the License.
|
||||
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
|
||||
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
|
||||
<set field="glFiscalTypeId" from-field="parameters.glFiscalTypeId" default-value="ACTUAL"/>
|
||||
<service service-name="getPartyAccountingPreferences" result-map="result">
|
||||
<field-map field-name="organizationPartyId" value="${groovy:parameters.get('ApplicationDecorator|organizationPartyId')}"/>
|
||||
</service>
|
||||
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
|
||||
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
|
||||
<script location="component://accounting/groovyScripts/reports/IncomeStatement.groovy"/>
|
||||
</actions>
|
||||
<widgets>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="CommonExtCreatePublicMessage">
|
||||
<value xml:lang="de">Erzeuge öffentliche Nachricht</value>
|
||||
<value xml:lang="en">Create Public Message</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="PageTitleEditProductCategory">
|
||||
<value xml:lang="en">Edit Product Category</value>
|
||||
<value xml:lang="fr">Edition de la catégorie produit</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entitymodel.xsd">
|
||||
<title>Entity of an Apache OFBiz Component</title>
|
||||
<description>None</description>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="commonext"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
|
||||
|
||||
@@ -19,6 +19,6 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
|
||||
</service-eca>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Commonext Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
<version>1.0</version>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<web-app version="3.0">
|
||||
<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 - Setup Manager</display-name>
|
||||
<description>Setup Manager Module of the Apache OFBiz Project</description>
|
||||
|
||||
@@ -57,6 +57,11 @@
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
|
||||
</filter>
|
||||
<filter>
|
||||
<display-name>SameSiteFilter</display-name>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>ControlFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
@@ -65,6 +70,10 @@
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
<filter-mapping>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
-->
|
||||
|
||||
|
||||
<web-app version="3.0">
|
||||
<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>Empty placeholder</display-name>
|
||||
<description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&revision=1612202 </description>
|
||||
</web-app>
|
||||
|
||||
@@ -81,7 +81,7 @@ function setKeyAsParameter(event, ui) {
|
||||
function getAssociatedStateList(countryId, stateId, errorId, divId) {
|
||||
var countryGeoId = jQuery("#" + countryId).val();
|
||||
var requestToSend = "getAssociatedStateList";
|
||||
if (jQuery('#orderViewed')) {
|
||||
if (jQuery('#orderViewed').length) {
|
||||
requestToSend = "/ordermgr/control/getAssociatedStateList"
|
||||
}
|
||||
jQuery.ajax({
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/component-loader.xsd">
|
||||
<load-component component-location="datamodel"/>
|
||||
<load-component component-location="party"/>
|
||||
<load-component component-location="securityext"/>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="CharacterSet.description.ISO-8859-1">
|
||||
<value xml:lang="en">ISO-8859-1</value>
|
||||
<value xml:lang="es">ISO-8859-1 Inglés</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="contentevents.error_getting_content_list">
|
||||
<value xml:lang="en">Error getting the content list to index: ${gee}.</value>
|
||||
<value xml:lang="ja">コンテンツリストの取得時にエラー。索引: ${gee}.</value>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
|
||||
<property key="CannotFindCmsform">
|
||||
<value xml:lang="de">Die CMS Form kann nicht gefunden werden!</value>
|
||||
<value xml:lang="en">Cannot find the cmsform!</value>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<entity-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/entity-eca.xsd">
|
||||
|
||||
<!-- If the text in the database has changed for the data resource, we need to clear out anything depending on this cached value -->
|
||||
<eca entity="ElectronicText" operation="store-remove" event="return">
|
||||
|
||||
@@ -101,7 +101,6 @@
|
||||
<if-not-empty field="parameters.summaryData">
|
||||
<!-- create the summary data -->
|
||||
<set field="createSummary.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
|
||||
<set field="createSummary.contentPurposeTypeId" value="ARTICLE"/>
|
||||
<set field="createSummary.dataTemplateTypeId" value="NONE"/>
|
||||
<set field="createSummary.mapKey" value="SUMMARY"/>
|
||||
<set field="createSummary.ownerContentId" from-field="ownerContentId"/>
|
||||
|
||||
@@ -771,83 +771,6 @@
|
||||
<field-to-result field="contentId"/>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="getSubContentWithPermCheck" short-description="Get sub content and perform permission check on each record">
|
||||
|
||||
<set field="filterByDate" from-field="parameters.filterByDate" default-value="true" type="Boolean"/>
|
||||
<set field="useCache" from-field="parameters.useCache" default-value="true" type="Boolean"/>
|
||||
<entity-condition entity-name="ContentAssocViewTo" list="viewList" filter-by-date="${filterByDate}" use-cache="${useCache}">
|
||||
<condition-list combine="and">
|
||||
<condition-expr field-name="contentIdStart" from-field="parameters.contentId"/>
|
||||
<condition-expr field-name="caContentAssocTypeId" from-field="parameters.contentAssocTypeId" ignore-if-empty="true"/>
|
||||
<condition-expr field-name="caMapKey" from-field="parameters.mapKey" ignore-if-empty="true"/>
|
||||
</condition-list>
|
||||
</entity-condition>
|
||||
|
||||
<iterate list="viewList" entry="view">
|
||||
<set field="hasPermission" value="true" type="Boolean"/>
|
||||
<if>
|
||||
<condition>
|
||||
<and>
|
||||
<not>
|
||||
<if-empty field="parameters.mainAction"/>
|
||||
</not>
|
||||
<not>
|
||||
<if-empty field="parameters.userLogin"/>
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
<then>
|
||||
<set field="inMap.contentId" from-field="parameters.contentId"/>
|
||||
<set field="inMap.mainAction" from-field="parameters.mainAction"/>
|
||||
<set field="inMap.userLogin" from-field="parameters.userLogin"/>
|
||||
<set field="inMap.contentOperationId" from-field="parameters.contentOperationId" default-value="CONTENT_CREATE"/>
|
||||
<call-service service-name="genericContentPermission" in-map-name="inMap" include-user-login="true">
|
||||
<result-to-field result-name="hasPermission"/>
|
||||
</call-service>
|
||||
</then>
|
||||
</if>
|
||||
<if-compare field="hasPermission" operator="equals" value="true" type="Boolean">
|
||||
<set field="contentViewList[]" from-field="view"/>
|
||||
</if-compare>
|
||||
</iterate>
|
||||
<field-to-result field="contentViewList" result-name="subContentList"/>
|
||||
|
||||
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="getSubSubContentWithPermCheck" short-description="Get sub content and perform permission check on each record">
|
||||
|
||||
<set-service-fields service-name="getSubContentWithPermCheck" map="parameters" to-map="inMap"/>
|
||||
<call-service service-name="getSubContentWithPermCheck" in-map-name="inMap">
|
||||
<result-to-field result-name="subContentList"/>
|
||||
</call-service>
|
||||
|
||||
<iterate list="subContentList" entry="view">
|
||||
<entity-condition list="viewList" entity-name="ContentAssocViewTo" filter-by-date="true" use-cache="${useCache}">
|
||||
<condition-list combine="and">
|
||||
<condition-expr field-name="contentIdStart" from-field="view.caContentIdTo"/>
|
||||
<condition-expr field-name="caContentAssocTypeId" from-field="parameters.subContentAssocTypeId" ignore-if-empty="true"/>
|
||||
<condition-expr field-name="caMapKey" from-field="parameters.subMapKey" ignore-if-empty="true"/>
|
||||
</condition-list>
|
||||
</entity-condition>
|
||||
<clear-field field="view2"/>
|
||||
<first-from-list list="viewList" entry="view2"/>
|
||||
<clear-field field="map"/>
|
||||
<set field="map.contentIdFrom" from-field="view.contentId"/>
|
||||
<set field="map.dataResourceIdFrom" from-field="view.dataResourceId"/>
|
||||
<set field="map.contentId" from-field="view2.contentId"/>
|
||||
<set field="map.contentName" from-field="view2.contentName"/>
|
||||
<set field="map.description" from-field="view2.description"/>
|
||||
<entity-one entity-name="ElectronicText" value-field="electronicText">
|
||||
<field-map field-name="dataResourceId" from-field="view2.dataResourceId"/>
|
||||
</entity-one>
|
||||
<set field="map.textData" from-field="electronicText.textData"/>
|
||||
<set field="contentViewList[]" from-field="map"/>
|
||||
</iterate>
|
||||
<field-to-result field="subContentList" result-name="subContentList"/>
|
||||
<field-to-result field="contentViewList" result-name="subSubContentList"/>
|
||||
</simple-method>
|
||||
|
||||
<simple-method method-name="forceIndexContentKeywords" short-description="induce all the keywords of a content">
|
||||
<entity-one entity-name="Content" value-field="content"/>
|
||||
<call-class-method class-name="org.apache.ofbiz.content.content.ContentKeywordIndex" method-name="forceIndexKeywords">
|
||||
|
||||
@@ -20,7 +20,7 @@ under the License.
|
||||
|
||||
<ofbiz-component name="content"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/ofbiz-component.xsd">
|
||||
<resource-loader name="main" type="component"/>
|
||||
<classpath type="dir" location="config"/>
|
||||
<classpath type="dir" location="dtd"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-mca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-mca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-mca.xsd">
|
||||
|
||||
<mca mail-rule-name="processIncomingEmail">
|
||||
<action service="storeIncomingEmail" mode="sync"/>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/service-eca.xsd">
|
||||
<eca service="createFile" event="in-validate">
|
||||
<condition field-name="dataResource" operator="is-empty"/>
|
||||
<action service="createDataResource" mode="sync"/>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
@@ -40,33 +40,6 @@
|
||||
<attribute mode="OUT" name="resultData" optional="true" type="java.util.Map"/>
|
||||
</service>
|
||||
|
||||
<service name="getSubContentWithPermCheck" engine="simple" auth="true"
|
||||
location="component://content/minilang/content/ContentServices.xml" invoke="getSubContentWithPermCheck">
|
||||
<description>Get Content and resource information</description>
|
||||
<permission-service service-name="genericContentPermission" main-action="VIEW"/>
|
||||
<attribute mode="IN" name="contentId" optional="false" type="String">
|
||||
<type-validate>
|
||||
<fail-property resource="ContentErrorUiLabels" property="ContentRequiredFieldMissingContentId"/>
|
||||
</type-validate>
|
||||
</attribute>
|
||||
<attribute mode="IN" name="contentAssocTypeId" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="mapKey" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="mainAction" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="contentOperationId" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="useCache" optional="true" type="Boolean"/>
|
||||
<attribute mode="IN" name="filterByDate" optional="true" type="Boolean"/>
|
||||
<attribute mode="OUT" name="subContentList" optional="true" type="java.util.List"/>
|
||||
</service>
|
||||
|
||||
<service name="getSubSubContentWithPermCheck" engine="simple" auth="true"
|
||||
location="component://content/minilang/content/ContentServices.xml" invoke="getSubSubContentWithPermCheck">
|
||||
<description>Get Content associated with Content</description>
|
||||
<implements service="getSubContentWithPermCheck"/>
|
||||
<attribute mode="IN" name="subContentAssocTypeId" optional="true" type="String"/>
|
||||
<attribute mode="IN" name="subMapKey" optional="true" type="String"/>
|
||||
<attribute mode="OUT" name="subSubContentList" optional="true" type="java.util.List"/>
|
||||
</service>
|
||||
|
||||
<service name="getContentAndDataResource" engine="simple" default-entity-name="Content" auth="true"
|
||||
location="component://content/minilang/content/ContentServices.xml" invoke="getContentAndDataResource">
|
||||
<description>Get Content and resource information</description>
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Content Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Data Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Document Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Output Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ under the License.
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
-->
|
||||
|
||||
<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
|
||||
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/services.xsd">
|
||||
<description>Content Component WebSite Services</description>
|
||||
<vendor>OFBiz</vendor>
|
||||
|
||||
|
||||
+150
-115
@@ -18,6 +18,8 @@
|
||||
*******************************************************************************/
|
||||
package org.apache.ofbiz.content;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.sql.Timestamp;
|
||||
@@ -29,6 +31,7 @@ import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.imaging.ImageReadException;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.StringUtil;
|
||||
import org.apache.ofbiz.base.util.UtilDateTime;
|
||||
@@ -260,7 +263,7 @@ public class ContentManagementServices {
|
||||
}
|
||||
// Do update and create permission checks on Content if warranted.
|
||||
|
||||
context.put("skipPermissionCheck", null); // Force check here
|
||||
context.put("skipPermissionCheck", null); // Force check here
|
||||
boolean contentExists = true;
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in persist... contentTypeId:" + contentTypeId + " dataResourceTypeId:" + dataResourceTypeId + " contentId:" + contentId + " dataResourceId:" + dataResourceId, module);
|
||||
@@ -271,7 +274,9 @@ public class ContentManagementServices {
|
||||
} else {
|
||||
try {
|
||||
GenericValue val = EntityQuery.use(delegator).from("Content").where("contentId", contentId).queryOne();
|
||||
if (val == null) contentExists = false;
|
||||
if (val == null) {
|
||||
dataResourceExists = false;
|
||||
}
|
||||
} catch (GenericEntityException e) {
|
||||
return ServiceUtil.returnError(e.toString());
|
||||
}
|
||||
@@ -403,9 +408,8 @@ public class ContentManagementServices {
|
||||
}
|
||||
|
||||
/**
|
||||
Service for update publish sites with a ContentRole that will tie them to the passed
|
||||
in party.
|
||||
*/
|
||||
* Service for update publish sites with a ContentRole that will tie them to the passed in party.
|
||||
*/
|
||||
public static Map<String, Object> updateSiteRoles(DispatchContext dctx, Map<String, ? extends Object> context) {
|
||||
LocalDispatcher dispatcher = dctx.getDispatcher();
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
@@ -461,7 +465,7 @@ public class ContentManagementServices {
|
||||
String errMsg = ServiceUtil.getErrorMessage(permResults);
|
||||
if (UtilValidate.isNotEmpty(errMsg)) {
|
||||
return ServiceUtil.returnError(errMsg);
|
||||
}
|
||||
}
|
||||
} catch (GenericServiceException e) {
|
||||
Debug.logError(e, e.toString(), module);
|
||||
return ServiceUtil.returnError(e.toString());
|
||||
@@ -529,17 +533,24 @@ public class ContentManagementServices {
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Map<String, Object> persistDataResourceAndDataMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) throws GenericServiceException, GenericEntityException, Exception {
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
LocalDispatcher dispatcher = dctx.getDispatcher();
|
||||
Map<String, Object> context = UtilMisc.makeMapWritable(rcontext);
|
||||
Map<String, Object> result = new HashMap<String, Object>();
|
||||
Map<String, Object> newDrContext = new HashMap<String, Object>();
|
||||
GenericValue dataResource = delegator.makeValue("DataResource");
|
||||
dataResource.setPKFields(context);
|
||||
dataResource.setNonPKFields(context);
|
||||
dataResource.setAllFields(context, false, "dr", null);
|
||||
context.putAll(dataResource);
|
||||
public static Map<String, Object> persistDataResourceAndDataMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext)
|
||||
throws GenericServiceException, GenericEntityException {
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
LocalDispatcher dispatcher = dctx.getDispatcher();
|
||||
Map<String, Object> context = UtilMisc.makeMapWritable(rcontext);
|
||||
|
||||
String errorMessage = validateUploadedFile(dctx, context);
|
||||
if (errorMessage != null) {
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
Map<String, Object> newDrContext = new HashMap<>();
|
||||
GenericValue dataResource = delegator.makeValue("DataResource");
|
||||
dataResource.setPKFields(context);
|
||||
dataResource.setNonPKFields(context);
|
||||
dataResource.setAllFields(context, false, "dr", null);
|
||||
context.putAll(dataResource);
|
||||
|
||||
GenericValue electronicText = delegator.makeValue("ElectronicText");
|
||||
electronicText.setPKFields(context);
|
||||
@@ -583,100 +594,102 @@ public class ContentManagementServices {
|
||||
newDrContext.put("mimeTypeId", mimeTypeId);
|
||||
}
|
||||
|
||||
if (!dataResourceExists) { // Create
|
||||
Map<String, Object> thisResult = dispatcher.runSync("createDataResource", newDrContext);
|
||||
String errorMsg = ServiceUtil.getErrorMessage(thisResult);
|
||||
if (UtilValidate.isNotEmpty(errorMsg)) {
|
||||
throw(new Exception(errorMsg));
|
||||
}
|
||||
dataResourceId = (String)thisResult.get("dataResourceId");
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, module);
|
||||
}
|
||||
dataResource = (GenericValue)thisResult.get("dataResource");
|
||||
Map<String, Object> fileContext = new HashMap<String, Object>();
|
||||
fileContext.put("userLogin", userLogin);
|
||||
if ("IMAGE_OBJECT".equals(dataResourceTypeId)) {
|
||||
if (imageDataBytes != null) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("imageData", imageDataBytes);
|
||||
thisResult = dispatcher.runSync("createImage", fileContext);
|
||||
errorMsg = ServiceUtil.getErrorMessage(thisResult);
|
||||
if (UtilValidate.isNotEmpty(errorMsg)) {
|
||||
return ServiceUtil.returnError(errorMsg);
|
||||
}
|
||||
}
|
||||
} else if ("SHORT_TEXT".equals(dataResourceTypeId)) {
|
||||
} else if ("SURVEY".startsWith(dataResourceTypeId)) {
|
||||
} else if ("_FILE".indexOf(dataResourceTypeId) >=0) {
|
||||
Map<String, Object> uploadImage = new HashMap<String, Object>();
|
||||
uploadImage.put("userLogin", userLogin);
|
||||
uploadImage.put("dataResourceId", dataResourceId);
|
||||
uploadImage.put("dataResourceTypeId", dataResourceTypeId);
|
||||
uploadImage.put("rootDir", context.get("objectInfo"));
|
||||
uploadImage.put("uploadedFile", imageDataBytes);
|
||||
uploadImage.put("_uploadedFile_fileName", (String) context.get("_imageData_fileName"));
|
||||
uploadImage.put("_uploadedFile_contentType", (String) context.get("_imageData_contentType"));
|
||||
dispatcher.runSync("attachUploadToDataResource", uploadImage);
|
||||
} else {
|
||||
// assume ELECTRONIC_TEXT
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("textData", textData);
|
||||
thisResult = dispatcher.runSync("createElectronicText", fileContext);
|
||||
errorMsg = ServiceUtil.getErrorMessage(thisResult);
|
||||
if (UtilValidate.isNotEmpty(errorMsg)) {
|
||||
return ServiceUtil.returnError(errorMsg);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else { // Update
|
||||
Map<String, Object> thisResult = dispatcher.runSync("updateDataResource", newDrContext);
|
||||
String errorMsg = ServiceUtil.getErrorMessage(thisResult);
|
||||
if (UtilValidate.isNotEmpty(errorMsg)) {
|
||||
return ServiceUtil.returnError(errorMsg);
|
||||
}
|
||||
Map<String, Object> fileContext = new HashMap<String, Object>();
|
||||
fileContext.put("userLogin", userLogin);
|
||||
String forceElectronicText = (String)context.get("forceElectronicText");
|
||||
if ("IMAGE_OBJECT".equals(dataResourceTypeId)) {
|
||||
if (imageDataBytes != null || "true".equalsIgnoreCase(forceElectronicText)) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("imageData", imageDataBytes);
|
||||
thisResult = dispatcher.runSync("updateImage", fileContext);
|
||||
errorMsg = ServiceUtil.getErrorMessage(thisResult);
|
||||
if (UtilValidate.isNotEmpty(errorMsg)) {
|
||||
return ServiceUtil.returnError(errorMsg);
|
||||
}
|
||||
}
|
||||
} else if ("SHORT_TEXT".equals(dataResourceTypeId)) {
|
||||
} else if ("SURVEY".startsWith(dataResourceTypeId)) {
|
||||
} else if ("_FILE".indexOf(dataResourceTypeId) >=0) {
|
||||
Map<String, Object> uploadImage = new HashMap<String, Object>();
|
||||
uploadImage.put("userLogin", userLogin);
|
||||
uploadImage.put("dataResourceId", dataResourceId);
|
||||
uploadImage.put("dataResourceTypeId", dataResourceTypeId);
|
||||
uploadImage.put("rootDir", context.get("objectInfo"));
|
||||
uploadImage.put("uploadedFile", imageDataBytes);
|
||||
uploadImage.put("_uploadedFile_fileName", (String) context.get("_imageData_fileName"));
|
||||
uploadImage.put("_uploadedFile_contentType", (String) context.get("_imageData_contentType"));
|
||||
dispatcher.runSync("attachUploadToDataResource", uploadImage);
|
||||
} else {
|
||||
if (UtilValidate.isNotEmpty(textData) || "true".equalsIgnoreCase(forceElectronicText)) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("textData", textData);
|
||||
thisResult = dispatcher.runSync("updateElectronicText", fileContext);
|
||||
errorMsg = ServiceUtil.getErrorMessage(thisResult);
|
||||
if (UtilValidate.isNotEmpty(errorMsg)) {
|
||||
return ServiceUtil.returnError(errorMsg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
result.put("dataResourceId", dataResourceId);
|
||||
result.put("drDataResourceId", dataResourceId);
|
||||
context.put("dataResourceId", dataResourceId);
|
||||
return result;
|
||||
if (!dataResourceExists) { // Create
|
||||
Map<String, Object> thisResult = dispatcher.runSync("createDataResource", newDrContext);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
throw (new GenericServiceException(ServiceUtil.getErrorMessage(thisResult)));
|
||||
}
|
||||
dataResourceId = (String) thisResult.get("dataResourceId");
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, module);
|
||||
}
|
||||
dataResource = (GenericValue) thisResult.get("dataResource");
|
||||
Map<String, Object> fileContext = new HashMap<>();
|
||||
fileContext.put("userLogin", userLogin);
|
||||
if ("IMAGE_OBJECT".equals(dataResourceTypeId)) {
|
||||
if (imageDataBytes != null) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("imageData", imageDataBytes);
|
||||
thisResult = dispatcher.runSync("createImage", fileContext);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
|
||||
}
|
||||
}
|
||||
// We don't want SHORT_TEXT and SURVEY to be caught by the last else if, hence the 2 empty else if
|
||||
} else if ("SHORT_TEXT".equals(dataResourceTypeId)) {
|
||||
} else if (dataResourceTypeId.startsWith("SURVEY")) {
|
||||
} else if (dataResourceTypeId.indexOf("_FILE") >= 0) {
|
||||
Map<String, Object> uploadImage = new HashMap<>();
|
||||
uploadImage.put("userLogin", userLogin);
|
||||
uploadImage.put("dataResourceId", dataResourceId);
|
||||
uploadImage.put("dataResourceTypeId", dataResourceTypeId);
|
||||
uploadImage.put("rootDir", context.get("objectInfo"));
|
||||
uploadImage.put("uploadedFile", imageDataBytes);
|
||||
uploadImage.put("_uploadedFile_fileName", context.get("_imageData_fileName"));
|
||||
uploadImage.put("_uploadedFile_contentType", context.get("_imageData_contentType"));
|
||||
thisResult = dispatcher.runSync("attachUploadToDataResource", uploadImage);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
|
||||
}
|
||||
} else {
|
||||
// assume ELECTRONIC_TEXT
|
||||
if (UtilValidate.isNotEmpty(textData)) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("textData", textData);
|
||||
thisResult = dispatcher.runSync("createElectronicText", fileContext);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
|
||||
}
|
||||
}
|
||||
}
|
||||
} else { // Update
|
||||
Map<String, Object> thisResult = dispatcher.runSync("updateDataResource", newDrContext);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
|
||||
}
|
||||
Map<String, Object> fileContext = new HashMap<>();
|
||||
fileContext.put("userLogin", userLogin);
|
||||
String forceElectronicText = (String) context.get("forceElectronicText");
|
||||
if ("IMAGE_OBJECT".equals(dataResourceTypeId)) {
|
||||
if (imageDataBytes != null || "true".equalsIgnoreCase(forceElectronicText)) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("imageData", imageDataBytes);
|
||||
thisResult = dispatcher.runSync("updateImage", fileContext);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
|
||||
}
|
||||
}
|
||||
// We don't want SHORT_TEXT and SURVEY to be caught by the last else if, hence the 2 empty else if
|
||||
} else if ("SHORT_TEXT".equals(dataResourceTypeId)) {
|
||||
} else if (dataResourceTypeId.startsWith("SURVEY")) {
|
||||
} else if (dataResourceTypeId.indexOf("_FILE") >= 0) {
|
||||
Map<String, Object> uploadImage = new HashMap<>();
|
||||
uploadImage.put("userLogin", userLogin);
|
||||
uploadImage.put("dataResourceId", dataResourceId);
|
||||
uploadImage.put("dataResourceTypeId", dataResourceTypeId);
|
||||
uploadImage.put("rootDir", context.get("objectInfo"));
|
||||
uploadImage.put("uploadedFile", imageDataBytes);
|
||||
uploadImage.put("_uploadedFile_fileName", context.get("_imageData_fileName"));
|
||||
uploadImage.put("_uploadedFile_contentType", context.get("_imageData_contentType"));
|
||||
thisResult = dispatcher.runSync("attachUploadToDataResource", uploadImage);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
|
||||
}
|
||||
} else {
|
||||
if (UtilValidate.isNotEmpty(textData) || "true".equalsIgnoreCase(forceElectronicText)) {
|
||||
fileContext.put("dataResourceId", dataResourceId);
|
||||
fileContext.put("textData", textData);
|
||||
thisResult = dispatcher.runSync("updateElectronicText", fileContext);
|
||||
if (ServiceUtil.isError(thisResult)) {
|
||||
return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
result.put("dataResourceId", dataResourceId);
|
||||
result.put("drDataResourceId", dataResourceId);
|
||||
context.put("dataResourceId", dataResourceId);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static void addRoleToUser(Delegator delegator, LocalDispatcher dispatcher, Map<String, Object> serviceContext) throws GenericServiceException, GenericEntityException {
|
||||
@@ -735,7 +748,7 @@ public class ContentManagementServices {
|
||||
} else {
|
||||
if (fromDate != null) {
|
||||
// for now, will assume that any error is due to non-existence - ignore
|
||||
//return ServiceUtil.returnError(e.toString());
|
||||
// return ServiceUtil.returnError(e.toString());
|
||||
try {
|
||||
Debug.logInfo("updateSiteRoles, serviceContext(2):" + serviceContext, module);
|
||||
Map<String, Object> newContext = new HashMap<String, Object>();
|
||||
@@ -960,7 +973,6 @@ public class ContentManagementServices {
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This service changes the contentTypeId of the current content and its children depending on the pageMode.
|
||||
* if pageMode == "outline" then if the contentTypeId of children is not "OUTLINE_NODE" or "PAGE_NODE"
|
||||
@@ -1430,7 +1442,7 @@ public class ContentManagementServices {
|
||||
}
|
||||
orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
|
||||
if (orderHeader == null) {
|
||||
String msg = UtilProperties.getMessage(resource, "ContentNoOrderHeaderFound", UtilMisc.toMap("orderId", orderId), locale);
|
||||
String msg = UtilProperties.getMessage(resource, "ContentNoOrderHeaderFound", UtilMisc.toMap("orderId", orderId), locale);
|
||||
return ServiceUtil.returnError(msg);
|
||||
}
|
||||
Timestamp orderCreatedDate = (Timestamp) orderHeader.get("orderDate");
|
||||
@@ -1490,7 +1502,9 @@ public class ContentManagementServices {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
public static Map<String, Object> followNodeChildrenMethod(GenericValue content, LocalDispatcher dispatcher, String serviceName, Map<String, Object> context) throws GenericEntityException, GenericServiceException {
|
||||
|
||||
public static Map<String, Object> followNodeChildrenMethod(GenericValue content, LocalDispatcher dispatcher, String serviceName,
|
||||
Map<String, Object> context) throws GenericEntityException, GenericServiceException {
|
||||
Map<String, Object> result = null;
|
||||
String contentId = content.getString("contentId");
|
||||
List<String> contentAssocTypeIdList = UtilGenerics.checkList(context.get("contentAssocTypeIdList"));
|
||||
@@ -1584,4 +1598,25 @@ public class ContentManagementServices {
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
private static String validateUploadedFile(DispatchContext dctx, Map<String, ? extends Object> context) {
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
Locale locale = (Locale) context.get("locale");
|
||||
String objectInfo = (String) context.get("objectInfo");
|
||||
String errorMessage = null;
|
||||
if (!UtilValidate.isEmpty(objectInfo)) {
|
||||
File file = new File(objectInfo);
|
||||
if (file.isFile()) {
|
||||
try {
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(objectInfo, "All", delegator)) {
|
||||
errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
}
|
||||
} catch (ImageReadException | IOException e) {
|
||||
errorMessage = UtilProperties.getMessage(resource, "ContentUnableToOpenFileForWriting", UtilMisc.toMap("fileName",
|
||||
objectInfo), locale);
|
||||
}
|
||||
}
|
||||
}
|
||||
return errorMessage;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,6 +79,13 @@ public class DataEvents {
|
||||
// get the permission service required for streaming data; default is always the genericContentPermission
|
||||
String permissionService = EntityUtilProperties.getPropertyValue("content", "stream.permission.service", "genericContentPermission", delegator);
|
||||
|
||||
// This is counterintuitive but it works, for OFBIZ-11840
|
||||
// It could be improved by checking for possible events associated with svg
|
||||
// As listed at https://portswigger.net/web-security/cross-site-scripting/cheat-sheet
|
||||
if (contentId.contains("<svg")) {
|
||||
return "success";
|
||||
}
|
||||
|
||||
// get the content record
|
||||
GenericValue content;
|
||||
try {
|
||||
|
||||
@@ -28,10 +28,12 @@ import java.io.StringWriter;
|
||||
import java.io.Writer;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.commons.imaging.ImageReadException;
|
||||
import org.apache.ofbiz.base.util.Debug;
|
||||
import org.apache.ofbiz.base.util.GeneralException;
|
||||
import org.apache.ofbiz.base.util.UtilDateTime;
|
||||
@@ -49,7 +51,6 @@ import org.apache.ofbiz.service.GenericServiceException;
|
||||
import org.apache.ofbiz.service.ModelService;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
|
||||
import edu.emory.mathcs.backport.java.util.Arrays;
|
||||
|
||||
/**
|
||||
* DataServices Class
|
||||
@@ -196,7 +197,7 @@ public class DataServices {
|
||||
}
|
||||
|
||||
public static Map<String, Object> createFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) {
|
||||
//GenericValue dataResource = (GenericValue) context.get("dataResource");
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
String dataResourceTypeId = (String) context.get("dataResourceTypeId");
|
||||
String objectInfo = (String) context.get("objectInfo");
|
||||
ByteBuffer binData = (ByteBuffer) context.get("binData");
|
||||
@@ -248,7 +249,11 @@ public class DataServices {
|
||||
OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), UtilIO.getUtf8());
|
||||
) {
|
||||
out.write(textData);
|
||||
} catch (IOException e) {
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedTextFileFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
} catch (IOException | ImageReadException e) {
|
||||
Debug.logWarning(e, module);
|
||||
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentUnableWriteCharacterDataToFile", UtilMisc.toMap("fileName", file.getAbsolutePath()), locale));
|
||||
}
|
||||
@@ -257,7 +262,13 @@ public class DataServices {
|
||||
RandomAccessFile out = new RandomAccessFile(file, "rw");
|
||||
out.write(binData.array());
|
||||
out.close();
|
||||
} catch (FileNotFoundException e) {
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
|
||||
} catch (FileNotFoundException | ImageReadException e) {
|
||||
Debug.logError(e, module);
|
||||
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentUnableToOpenFileForWriting", UtilMisc.toMap("fileName", file.getAbsolutePath()), locale));
|
||||
} catch (IOException e) {
|
||||
@@ -397,6 +408,7 @@ public class DataServices {
|
||||
}
|
||||
|
||||
public static Map<String, Object> updateFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException {
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
Locale locale = (Locale) context.get("locale");
|
||||
String dataResourceTypeId = (String) context.get("dataResourceTypeId");
|
||||
@@ -437,7 +449,11 @@ public class DataServices {
|
||||
OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file),UtilIO.getUtf8());
|
||||
) {
|
||||
out.write(textData);
|
||||
} catch (IOException e) {
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "Text", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedTextFileFormats", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
} catch (IOException | ImageReadException e) {
|
||||
Debug.logWarning(e, module);
|
||||
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentUnableWriteCharacterDataToFile", UtilMisc.toMap("fileName", file.getAbsolutePath()), locale));
|
||||
}
|
||||
@@ -447,7 +463,12 @@ public class DataServices {
|
||||
out.setLength(binData.array().length);
|
||||
out.write(binData.array());
|
||||
out.close();
|
||||
} catch (FileNotFoundException e) {
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
} catch (FileNotFoundException | ImageReadException e) {
|
||||
Debug.logError(e, module);
|
||||
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentUnableToOpenFileForWriting", UtilMisc.toMap("fileName", file.getAbsolutePath()), locale));
|
||||
} catch (IOException e) {
|
||||
@@ -577,12 +598,14 @@ public class DataServices {
|
||||
}
|
||||
|
||||
public static Map<String, Object> createBinaryFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException {
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
GenericValue dataResource = (GenericValue) context.get("dataResource");
|
||||
String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId");
|
||||
String objectInfo = (String) dataResource.get("objectInfo");
|
||||
byte [] imageData = (byte []) context.get("imageData");
|
||||
String rootDir = (String)context.get("rootDir");
|
||||
Locale locale = (Locale) context.get("locale");
|
||||
File file = null;
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in createBinaryFileMethod, dataResourceTypeId:" + dataResourceTypeId, module);
|
||||
@@ -604,10 +627,15 @@ public class DataServices {
|
||||
FileOutputStream out = new FileOutputStream(file);
|
||||
) {
|
||||
out.write(imageData);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in createBinaryFileMethod, length:" + file.length(), module);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
} catch (IOException | ImageReadException e) {
|
||||
Debug.logWarning(e, module);
|
||||
throw new GenericServiceException(e.getMessage());
|
||||
}
|
||||
@@ -630,12 +658,14 @@ public class DataServices {
|
||||
}
|
||||
|
||||
public static Map<String, Object> updateBinaryFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException {
|
||||
Delegator delegator = dctx.getDelegator();
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
GenericValue dataResource = (GenericValue) context.get("dataResource");
|
||||
String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId");
|
||||
String objectInfo = (String) dataResource.get("objectInfo");
|
||||
byte [] imageData = (byte []) context.get("imageData");
|
||||
String rootDir = (String)context.get("rootDir");
|
||||
Locale locale = (Locale) context.get("locale");
|
||||
File file = null;
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in updateBinaryFileMethod, dataResourceTypeId:" + dataResourceTypeId, module);
|
||||
@@ -660,11 +690,16 @@ public class DataServices {
|
||||
FileOutputStream out = new FileOutputStream(file);
|
||||
){
|
||||
out.write(imageData);
|
||||
// Check if a webshell is not uploaded
|
||||
if (!org.apache.ofbiz.security.SecuredUpload.isValidFile(file.getAbsolutePath(), "All", delegator)) {
|
||||
String errorMessage = UtilProperties.getMessage("SecurityUiLabels", "SupportedFileFormatsIncludingSvg", locale);
|
||||
return ServiceUtil.returnError(errorMessage);
|
||||
}
|
||||
|
||||
if (Debug.infoOn()) {
|
||||
Debug.logInfo("in updateBinaryFileMethod, length:" + file.length(), module);
|
||||
}
|
||||
out.close();
|
||||
} catch (IOException e) {
|
||||
} catch (IOException | ImageReadException e) {
|
||||
Debug.logWarning(e, module);
|
||||
throw new GenericServiceException(e.getMessage());
|
||||
}
|
||||
|
||||
+1
-2
@@ -131,8 +131,7 @@ public class LayoutEvents {
|
||||
}
|
||||
|
||||
GenericValue dataResource = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", dataResourceId).queryOne();
|
||||
// Use objectInfo field to store the name of the file, since there is no
|
||||
// place in ImageDataResource for it.
|
||||
// Use objectInfo field to store the name of the file, since there is no place in ImageDataResource for it.
|
||||
if (dataResource != null) {
|
||||
dataResource.set("objectInfo", imageFileName);
|
||||
dataResource.set("mimeTypeId", mimeTypeId);
|
||||
|
||||
@@ -35,6 +35,7 @@ import org.apache.ofbiz.base.util.UtilGenerics;
|
||||
import org.apache.ofbiz.base.util.UtilHttp;
|
||||
import org.apache.ofbiz.base.util.UtilMisc;
|
||||
import org.apache.ofbiz.base.util.UtilProperties;
|
||||
import org.apache.ofbiz.base.util.UtilValidate;
|
||||
import org.apache.ofbiz.service.ServiceUtil;
|
||||
|
||||
/**
|
||||
@@ -66,6 +67,9 @@ public final class LayoutWorker {
|
||||
return ServiceUtil.returnError(e4.getMessage());
|
||||
}
|
||||
|
||||
if(lst.size() == 0 && UtilValidate.isNotEmpty(request.getAttribute("fileItems"))) {
|
||||
lst = UtilGenerics.cast(request.getAttribute("fileItems"));
|
||||
}
|
||||
if (lst.size() == 0) {
|
||||
String errMsg = UtilProperties.getMessage(err_resource,
|
||||
"layoutEvents.no_files_uploaded", locale);
|
||||
|
||||
@@ -333,7 +333,18 @@
|
||||
<td class="label">${uiLabelMap.CommonUpload}</td>
|
||||
<td>
|
||||
<input type="hidden" name="isUploadObject" value="Y"/>
|
||||
<input type="file" name="uploadedFile" size="30"/>
|
||||
<#if dataResourceTypeId == 'IMAGE_OBJECT'>
|
||||
<input type="file" name="uploadedFile" size="30" accept=".png,.gif,.jpg,.jpeg,.tiff,.tif"/>
|
||||
</#if>
|
||||
<#if dataResourceTypeId == 'VIDEO_OBJECT'>
|
||||
<input type="file" name="uploadedFile" size="30" accept=".mpeg,.mpg,.mp4,.m4v,.mov,.qt,.asf,.avi,.asx,.asf,.flv,.wvx,.wm,.wmv,.wmx,.avi"/>
|
||||
</#if>
|
||||
<#if dataResourceTypeId == 'AUDIO_OBJECT'>
|
||||
<input type="file" name="uploadedFile" size="30" accept=".mp3,.ogg,.vorbis,.flac,.wav"/>
|
||||
</#if>
|
||||
<#if dataResourceTypeId == 'OTHER_OBJECT' || dataResourceTypeId == 'LOCAL_FILE' || dataResourceTypeId == 'OFBIZ_FILE' >
|
||||
<input type="file" name="uploadedFile" size="30"/>
|
||||
</#if>
|
||||
</td>
|
||||
</tr>
|
||||
<#elseif (dataResourceTypeId == 'URL_RESOURCE')>
|
||||
@@ -354,9 +365,9 @@
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<div id="editorcontainer" class="nocolumns">
|
||||
<textarea name="textData" id="cmseditor" style="margin: 0; width: 100%; border: 1px solid black;">
|
||||
<textarea name="textData" id="cmseditor" style="margin: 0; width: 100%; border: 1px solid black;">
|
||||
<#if (dataText?has_content)>
|
||||
${StringUtil.wrapString(dataText.textData!)}
|
||||
${StringUtil.wrapString(dataText.textData!)}
|
||||
</#if>
|
||||
</textarea>
|
||||
</div>
|
||||
@@ -370,4 +381,4 @@
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
</#if>
|
||||
</#if>
|
||||
|
||||
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<web-app version="3.0">
|
||||
<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 - Content Manager</display-name>
|
||||
<description>Content Manager Module of the Apache OFBiz Project</description>
|
||||
|
||||
@@ -62,6 +62,11 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
|
||||
</filter>
|
||||
<filter>
|
||||
<display-name>SameSiteFilter</display-name>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<filter-class>org.apache.ofbiz.webapp.control.SameSiteFilter</filter-class>
|
||||
</filter>
|
||||
<filter-mapping>
|
||||
<filter-name>ControlFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
@@ -70,6 +75,10 @@ under the License.
|
||||
<filter-name>ContextFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
<filter-mapping>
|
||||
<filter-name>SameSiteFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
</filter-mapping>
|
||||
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
|
||||
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
-->
|
||||
|
||||
|
||||
<web-app version="3.0">
|
||||
<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 - Content Empty placeholder</display-name>
|
||||
<description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&revision=1658621 </description>
|
||||
</web-app>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user