Reverts the simple method to use the original schema without namespace. "Duplicates" simple-methods.xsd in simple-methods-ns.xsd as we did, to get the simple-method namespace for compound-widgets.
For myself: when we will do the 3rd more elegant option (no schema duplication), have been changed also:
minilang-catalog.xml
compound-widgets.xsd
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749938 13f79535-47bb-0310-9956-ffa450edef68
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
OFBiz reads properties from either a properties file or the entity:SystemProperty. The way it worked previously is that OFBiz reads from the entity:SystemProperty first and if there is no value associated with the target propertyname, it would then locate the value from the relevant properties file.
In other words, if there is a database entry for a property, the database entry should override the associated properties file.
The issue is that if a database entry exist but the value is empty, it would look for a value from the properties file. It should not do so. If a database entry exists for the propertyname of interest, the value should be taken from the database even if it holds an empty value.
"isExistInDb" is first defined in Map<String, String> getSystemPropertyValue(String, String, Delegator). This method is call by many other methods. "isExistInDb" is used to indicate whether the method is returning an empty value for the property that 'exists' in the database rather than as a result of an absent database entry for the property.
The other methods...
boolean propertyValueEqualsIgnoreCase(String, String, String, Delegator)
String getPropertyValue(String, String, String, Delegator)
String getPropertyValue(String, String, Delegator)
String getMessage(String, String, Locale, Delegator)
uses the above method and needs to decide whether to use the empty value returned (ie. empty value from an existing property entry in database) or decide if it needs to read from the property file (ie. property entry does not exist in database)
jleroux: this also add systemPropertyValue data in CommonSystemPropertyData.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748560 13f79535-47bb-0310-9956-ffa450edef68
(resource == null || resource.length() <= 0)
From Java spec. a String, Collection, Map or CharSequence can't have a negative length, so the pattern above can be reduced to
(resource == null || resource.length() == 0)
which can be replaced using
UtilValidate.isEmpty()
I checked, there are several other occurrences of this pattern (some very old, I guess most were routinely copied from an initial occurrence). I decided to replace all of them, here they are.
I did that already long ago for the
(resource == null || resource.length() == 0)
pattern. It remains 4 of them. Three are justified (because of the dependency on base component or because using isEmpty() on Object is disputable for performance reasons). I took care of the remaining one right aways (in SplashScreen.java)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747976 13f79535-47bb-0310-9956-ffa450edef68
I removed duplicate paths were componentname was uselessly repeated after component://componentname/script/org/ofbiz (projectmngr was the only one using there project instead)
I had few typos, easily fixed thanks to the tests. There could be still typos but they are unexpected and anyway no-brainer to fix
I'm still wondering about specialpurpose/example/minilang/README.txt.
I changed its content to
"The minilang directory is for static resources that are interpreted at run time rather than being compiled. This goes on the classpath, but does not get built or put into a JAR file."
not sure it makes any sense, I don't see how this relates to the classpath.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747712 13f79535-47bb-0310-9956-ffa450edef68
This issue was due to the declaration of map with list syntax. It was introduced when we moved from Javolution collections to java collections.
One more issue found after fixing map syntax, that is missing block elements error. Added checks to handle that error as well.
Thanks Amardeep Singh Jhajj for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747202 13f79535-47bb-0310-9956-ffa450edef68
This error occurs due to the code used for dependent drop down for country and state. At party email address update page, no dependent drop down used, so js code triggering the request with empty countryGeoId and generating console error. Added check in code that if drop down field is not present on page then no need to observe it for the change.
Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746130 13f79535-47bb-0310-9956-ffa450edef68
In addition, add an export example button on FindExample screen and add complete macro ftl renderer unit test. Issue OFBIZ-6931 proposed by Leila Mekika. Thanks to her, jacques and pierre for theirs remarks.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746045 13f79535-47bb-0310-9956-ffa450edef68
Completes in screens the changes done in forms at r1741873. I then replaced few form lists by grids, where it was possible to do it with regexp.
Also complete StatsForms.xml to use only grids and "searchList" form in ecommerce ContentForms to NOT use grid (not called in screen)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742196 13f79535-47bb-0310-9956-ffa450edef68
Only ROU_ACTIVE statusItem exists for statusTypeId ROUTING_STATUS. Adding another such as ROU_INACTIVE would allow for more control over routings. Doing so entails adding the statusId to the find and edit screens.
ROU_INACTIVE was add as a StatusItem and currentStatusId was added to the routing find form as a multi-drop down
jleroux: I added use of common/webcommon/includes/setMultipleSelectJs.ftl and French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741789 13f79535-47bb-0310-9956-ffa450edef68
Also renames simple-methods-v2.xsd in simple-methods.xsd and replaces simple-methods-v2.xsd references by simple-methods.xsd references everywhere it's needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737087 13f79535-47bb-0310-9956-ffa450edef68
I decided to comment out as less as possible because once the RMI loaders, the RMI dispatcher and the related test services are off there is no RMI related danger left (test services are not a danger but would fail during tests run). It's then easier for users who need RMI in their projects to have only to uncomment those and not digg everywhere. Because the naming (JNDI) server relies on the rmi loader it will also be commented out.
[CVE-2016-2170] The infamous Java serialization vulnerability
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735569 13f79535-47bb-0310-9956-ffa450edef68
jleroux: this was git patch, I'm now used to change them to apply, but I will explain how to generate svn patch from it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729078 13f79535-47bb-0310-9956-ffa450edef68
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue is used in several .ftl files.
Replaces with EnittyUtilProperties variant where appropriate.
jleroux: In this is the 2nd commit from the 3rd patch (the 2nd had issues) I fixed 2 "typos" I spotted while reviewing in
ecommerce/customer/editcontactmech.ftl
ecommerce/customer/newcustomer.ftl
where "UtilProperties" was not replaced
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729002 13f79535-47bb-0310-9956-ffa450edef68
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue is used in several .ftl files.
Replaces with EnittyUtilProperties variant where appropriate.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728959 13f79535-47bb-0310-9956-ffa450edef68
VT_CHPWD_TMPLT_LOC for the changePassword
VT_FGPWD_TMPLT_LOC for the forgetPassword
VT_GSQUE_TMPLT_LOC for the getSecurityQuestion
Related issue OFBIZ-6868. The origin requirement came from issue OFBIZ-6843 with proposition to adding new theme with dedicate template for these previous element
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728026 13f79535-47bb-0310-9956-ffa450edef68
This improvement add a entity JobManagerLock, a new screen to add/edit job manager lock and an information for end user on FindJob and ScheduleJob screen.
See more information on issue OFBIZ-6790. Thanks to Jacques for sharing on this improvement.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1727570 13f79535-47bb-0310-9956-ffa450edef68