Commit Graph
233 Commits
Author SHA1 Message Date
Jacques Le Roux e7b3169d03 Improved: Rename some connoted words like blacklist and whitelist (OFBIZ-12168)
Renames respectively blacklist and whitelist to denylist and allowlist in
several places.

There are still a lot of master word which can be replaced by main, but not in
contexts where slave is also used. I'll discuss that on dev ML again...

Provides the migrateOldOrderBlacklistAndOldOrderBlacklistType service to migrate
records from OrderBlacklist and OrderBlacklistType entities to new OrderDenylist
and OrderDenylistType entities
2021-02-09 09:55:39 +01:00
James Yong 4a03567996 Improved: Allow logging to be disabled for getJs request (OFBIZ-11980)
Hide non-error logs related to getJs request as it doesn't provide meaningful data.

Thanks Jacques for initial review
2020-08-30 21:34:34 +08:00
Jacques Le Roux 0e7d31912b Fixed: Improve ObjectInputStream class (CVE-2019-0189)
Improved: no functional change
(OFBIZ-10837) (OFBIZ-11398)

Steps to generate:
1. Navigate to - catalog/control/EditProdCatalog?prodCatalogId=TestCatalog
2. Click on - CREATE SEO CATEGORY/PRODUCTS
3. The broken page will be displayed

The issue is due to the use of a GString in
createMissingCategoryAndProductAltUrls().

This:
    result.successMessageList = [
        "Categories updated: ${categoriesUpdated}",
        "Products updated: ${productsUpdated}"

As it's common to use such expressions I have added the necessary
org.codehaus.groovy.runtime.GStringImpl groovy.lang.GString
to the white list of classes in listOfSafeObjectsForInputStream in
SafeObjectInputStream.properties

I finally have also decided to use this property as default and commented for
committers to be aware that it should be also put in DEFAULT_WHITELIST_PATTERN
in SafeObjectInputStream class. Because if, for a reason,
listOfSafeObjectsForInputStream is empty OFBiz will still be protected

Thanks: Dikpal Kanungo for reporting
2020-02-24 11:00:51 +01:00
Jacques Le Roux 48a20b4782 Improved: Improve ObjectInputStream class
(OFBIZ-10837)

Fixes CVE-2019-0189

Allows users to easily override the list of accepted objects by using the
listOfSafeObjectsForInputStream property

CVE-2019-0189


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866834 13f79535-47bb-0310-9956-ffa450edef68
2019-09-12 07:49:41 +00:00
Jacques Le Roux 2178c6082a Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865347 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 11:34:01 +00:00
Jacques Le Roux 22e304d90a Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment Property for Solr to load faster

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865344 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 11:07:01 +00:00
Mathieu Lirzin 72aba3778c Improved: Remove support for “ofbiz-containers.xml”
(OFBIZ-11100)

To extend the containers loaded on startup, it was possible too both
edit the “ofbiz-containers.xml” file or alternatively to define a
container in a component.

This redundancy adds extra complexity in the startup process for no
good extensibility reason. The component container loader is more
flexible since it allows developper to add new containers without
touching the framework so it is better to only rely on this option.

The component loader is now hard-coded directly in code.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1863019 13f79535-47bb-0310-9956-ffa450edef68
2019-07-13 21:37:40 +00:00
Jacques Le Roux 2dadaacac8 Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe"
(OFBIZ-5254)

This was reopened after discussion at 
https://markmail.org/message/jnaitmwahjcjmdn5

This is a new solution which follows the work done with OFBIZ-6669 and OFBIZ-10187
Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers

Thanks: Christoph Neuroth for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859877 13f79535-47bb-0310-9956-ffa450edef68
2019-05-24 13:47:08 +00:00
Jacques Le Roux bea0b0e25f Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)

By default we now use a permissive sanitizer policy

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858980 13f79535-47bb-0310-9956-ffa450edef68
2019-05-09 09:17:08 +00:00
Michael Brohl 52254f4435 Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)

This makes the sanitizing enabled/disabled by configuration and enhances
the functionality to support custom sanitizer policies. A reasonable 
example policy class is also included.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858352 13f79535-47bb-0310-9956-ffa450edef68
2019-04-29 09:24:13 +00:00
Jacques Le Roux c1d09961dd Improved: Clean some Groovy files in base component
(OFBIZ-10646)

Following discussion at https://markmail.org/message/y3izmnxd7jd6jbkf 
this cleans some Groovy files in the base component, notably:

* remove ant-scripts folder and its content.
* Rename framework/base/groovyScript to framework/base/groovyScripts;
* Move GroovyInit.groovy and GroovyServiceTest.groovy respectively to 
  framework/base/groovyScripts and framework/common/groovyScripts 
  and change their paths where used.
* Removes GroovyInit.groovy from excludedConfigFiles in build.gradle
* After OFBIZ-10611 it's possible to move GroovyBaseScript.groovy  from
  framework/service/src/main/java/org/apache/ofbiz/service/engine
  to
  framework/service/src/main/groovy/org/apache/ofbiz/service/engine
* Removes FileUtilTests.groovy from basetests.xml (missed it in OFBIZ-10611)
* Fixes a typo in test-suite.xsd

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1846485 13f79535-47bb-0310-9956-ffa450edef68
2018-11-13 05:03:51 +00:00
Nicolas Malin aec57b51c5 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Third step, move macro ftl libraries and ftl template present on framework common to common theme
At this step, the common-theme is forced like the common component previously.

Main common screens present on CommonScreens.xml, LookupScreens.xml and HelpScreens.xml are moved to common screen with a forced rewrite to common-theme 
Warning this commit is going to follow with a other commit for CommonScreens.xml because LookupScreens.xml and HelpScreens.xml are recreated on common-theme, but to keep the history of CommonScreens.xml it was moved entirely, the second commit restore it with redirect call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806091 13f79535-47bb-0310-9956-ffa450edef68
2017-08-24 21:55:06 +00:00
Jacques Le Roux 3a2497a7a1 Completed: Removes the now useless hot-deploy directory
(OFBIZ-9268)

The hot-deploy removal was discussed at https://s.apache.org/7Y2w

This completes the previous commit at r1787461

Note: 
We need to remove or implement with Gradle the "depends-on" feature in 
ofbiz-component files
IMO, the applyOfbizPatchesAndHotDeploy.sh and svnUpHotdeploy.bat scrupts should 
be removed, done




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1787473 13f79535-47bb-0310-9956-ffa450edef68
2017-03-17 18:39:25 +00:00
Jacques Le Roux 084c4fd9db No functional changes
completes r1781219 by putting svn:eol-style=native to all file types declared 
in [auto-props] section of the svn config files.css

Actually this is only a 1st pass, it was too complicated to do it for  
all file types at once only concerned here
*.java;*.bsh;*.groovy;*.jsp;*.tld;*.ftl;*.js;*.sql;*.c;*.cpp;*.h;*.txt;*.sgml;
*.properties;*.xml;.classpath;.project;*.sld;*.gml;*.xsl;*.xsd
*.html;*.htm;*.css;*.md;README;NOTICE;LICENSE;rc.ofbiz.*;*.less;*.dsp;*.dsw

Most files should not be concerned by this change, but it's impossible to do
it one by one.

There are also changes in files with have mixed EOLs; because this has no sense
when using native which automatically resolves this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1781731 13f79535-47bb-0310-9956-ffa450edef68
2017-02-05 11:09:59 +00:00
Taher A. Alkhateeb 72b9013f24 Implemented: renamed the directory specialpurpose to plugins
(OFBIZ-7972)

In another step towards completing the plugin system for OFBiz, we renamed
the /specialpurpose directory to /plugins and changed all occurences of the
word "specialpurpose" to "plugins" in all files found in the system

Reference discussion: http://markmail.org/message/hpyuxkmftiyn44w2


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1778271 13f79535-47bb-0310-9956-ffa450edef68
2017-01-11 10:48:47 +00:00
Taher A. Alkhateeb 7d2d6216ca Improved: Refactor and simplify the startup sequence in OFBiz
(OFBIZ-8337)

Continuing the refactoring work on the startup sequence, this commit
specifically focuses on the ComponentContainer and how it loads
components into the system. The following changes are made:

- simplify and cleanup the ofbiz-containers.xml to have only one entry
- substantially simplify the ComponentLoaderConfig class and remove unnecessary defined state
- delete the JustLoadComponentsContainer (used to exist for the server command --testlist which no longer exists)
- fully refactor the ComponentContainer class and breakup the messy logic into chunks of private methods. The methods are also properly documented.
- remove an old reference to the testlist container which no longer exists



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772256 13f79535-47bb-0310-9956-ffa450edef68
2016-12-01 19:29:23 +00:00
Jacopo Cappellato 7370ea5409 Improved: added some missing license headers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762238 13f79535-47bb-0310-9956-ffa450edef68
2016-09-25 21:25:02 +00:00
Jacopo Cappellato b84345831b Improved: cleanups and enhancements in the FreeMarkerWorker class, and client
code using it, that wraps most of the OFBiz integration with FreeMarker.

This is the list of the main modifications:
* simplified and cleaned up the public methods of FreeMarkerWorker, used to 
retrieve and render Freemarker templates and changed client code accordingly to 
use them
* removed unused methods in FreeMarkerWorker and made some others private
* improved the integration code in FreeMarkerWorker to better use the Freemarker 
API and specifically to leverage the various TemplateLoaders and the Freemarker 
caching mechanism; it is now possible to switch the OFBiz legacy template 
caching mechanism to use the Freemarker one instead
* improved the implementation of Freemarker template rendering from strings 
(used by DataResourceWorker): it now leverages the Freemarker's 
StringTemplateLoader that provides the ability to cache the strings, retrieved 
from DataResources records, based on the timestamp of the last modification
* moved freemarkerImports.properties from "widget" to "base" component, and 
changed its content (and the content of the associated templates 
AutoImportTemplate.ftl and HtmlTemplate.ftl) to remove the dependency from base 
to widget&common; some resources of "widget" and "common" are still referenced 
from AutoImportTemplate.ftl (that is in "base") but even if they are soft 
dependencies: if they are missing the system will load properly without any 
error or warning; before this change it was impossible to use, or unit test, 
FreeMarkerWorker before the "widget" and "common" components were loaded by the 
system, now it is possible
* created a new class for unit tests for FreeMarkerWorker, named 
FreeMarkerWorkerTests: at the moment it contains just one simple unit test but 
more should be implemented
* refactored WebToolsServices.entityImport(...) to leverage the 
FreeMarkerWorker.renderTemplate(...) method to run the Freemarker template, 
rather than dealing with the Freemarker API directly; this is now possible 
thanks to the cleanups and improvements done in the FreeMarkerWorker class; this 
same approach should be implemented for a few other similar integration points 
(mostly in the "content" component); this is a TODO item
* moved the encodeDoubleQuotes(...) method from FreeMarkerWorker to 
MacroFormRenderer and made it private since this is the only calss using it and 
its logic is not related to FreeMarker



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762227 13f79535-47bb-0310-9956-ffa450edef68
2016-09-25 17:20:58 +00:00
Jacopo Cappellato a9835e4825 Improved: Removal of support for the Bean Scripting Framework (BSF).
(OFBIZ-8224)

This commit removes the support for the Bean Scripting Framework (BSF) from the OFBiz framework:
no application code was using this since several years and there are better and more modern tools at the present time.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760384 13f79535-47bb-0310-9956-ffa450edef68
2016-09-12 14:53:47 +00:00
Nicolas Malin 184d60206a Currently we have two methods for display log in OFBiz throught webtools :
* https://localhost:8443/webtools/control/LogView
* https://localhost:8443/webtools/control/FetchLogs
Each method use the same line rendering and the difference is : LogView display only runtime/logs/ofbiz.log (or you can surcharge it vith debug.properties) and FecthLogs list all file name ofbiz* present on runtime/logs/ofbiz.log and offert the possibility to search only line that macth a string.

I review the code to use only one script (remove LogView.groovy) and improve following points :
* Optimise the FetchLog.groovy to display with same velocity a file with or without string chain filtering
* Add a property to change the root log directory. Under linux we use /var/log/ofbiz/
* Add a regExp to match the file name of file present in the directory. Helpful when you want to see error.log
* Complete debug.properties with comment for describe example for new properties

And last point, add refresh button on the end page to reload the log without lost your state on the page.
Related issue OFBIZ-7944

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755302 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:05:48 +00:00
Jacques Le Roux 7ada24fd04 This removes the pos component. OFBIZ-7804 "Check if we should fix or remove the POS (hence WebPos?)"
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.

I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
                <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
                <entity-count entity-name="InventoryItem" count-field="iiCount">
                    <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
                </entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
//                if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
//                    continue;
//                }

While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754402 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 12:27:20 +00:00
Deepak Dixit f6ea4def32 (OFBIZ-6274) Change it loger level from info to all for org.apache.ofbiz, as all is top level logging level so if we turn on verbose/timing logging then it will working fine. As currently it set to info so timing/verbose log was not printed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753168 13f79535-47bb-0310-9956-ffa450edef68
2016-07-18 08:18:48 +00:00
Jacques Le Roux 84485f2a8e Fixes an issue in the log where only warning were shown. Related with <<Rename OFBiz artifacts from 'org.ofbiz.*' to org.apache.ofbiz.*'>> - https://issues.apache.org/jira/browse/OFBIZ-6274
We had already the org.apache logger. IIRW, it's because we use Apache libs (eg Tomcat) and we want to be warned when issues appear at this level. 
By adding the org.apache.ofbiz info logger we should keep warnings a the org.apache level and get info at the org.apache.ofbiz level

I'm though unsure why we needed 
<logger name="org.apache.ofbiz.base.converter.Converters" level="warn"/>
which seems contradictory. I Googled for an explanation but I'm still short of it. I'll check with http://logging.apache.org/log4j/2.x/manual/configuration.html.

For now it works, so I apply the patch because it's already a relief and will help to resolve the harder problem of instable tests results.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753029 13f79535-47bb-0310-9956-ffa450edef68
2016-07-17 08:37:19 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Gil Portenseigne 3130f0eb95 OFBIZ-7763 :
Remove all bsh libraries and bsh remaining fonctionnalities.
Bsh interpreter is replaced by GroovyShell evaluation.

To avoid groovyShell undefined var exception, the evaluated expression is analysed, detecting variables used and setting its to null if undefined in context.
Today only alphabetic variable with '_' are detected (i.e. my_variable==null).
Add in example a test replacement of &quot; syntax to simple quote.
Remove all found bsh references

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752231 13f79535-47bb-0310-9956-ffa450edef68
2016-07-11 23:04:54 +00:00
Jacopo Cappellato e0da901504 OFBIZ-7760 Removed from UtilCache the ability to persist entries in the file system.
This feature has been contributed a long time ago as an experimental feature but never really matured into a production ready artifact: since it was contributed, no users asked about how to use it, or tested it, or reported bugs or enhancement requests.
More importantly, the feature has always been disabled in the OFBiz framework (i.e. the widget code and the entity engine code were not using it).
This removal should not impact our user base; however, after the removal, an entry to the Attic will be created to keep track of it and to make it easier, to interested users, to get this code, improve it (e.g. by making it dependent on a live external jar, for example MapDB instead of JDBM) and possibly contribute it back to the project.
The most compelling reason for its removal is that the feature was based on a snapshot, unreleased version of JDBM, which is now a mostly dead project: for licensing reasons we are no more allowed to bundle jars in our releases. Additionally, having code that relies an old jar from a no more active project represents a maintenance issue for the community.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751817 13f79535-47bb-0310-9956-ffa450edef68
2016-07-07 17:00:05 +00:00
Taher A. Alkhateeb ca819dda9d Remove cobertura and sonar completely. Ref OFBIZ-6783
After getting consensus from the community in the email thread below
we agreed to remove these two items because they make the startup
logic more complex and also because many things are broken and 
unmaintained for years.

It is a good idea to reintroduce cobertura in the future on a cleaner
implementation, hopefully completely away from the start component and
perhaps as a container implementation.

The email thread:
http://ofbiz.markmail.org/message/b4jovfhurczunbam?q=remove+cobertura

The related JIRA:
https://issues.apache.org/jira/browse/OFBIZ-6783


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746236 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 06:43:11 +00:00
Jacques Le Roux e38ec39dfe This partially reverts r1735569 to simplify and have less commented out parts.
Fixes "Comment out RMI related code because of the Java deserialization issue" - https://issues.apache.org/jira/browse/OFBIZ-6942

We decided to comment out as less as possible because once, in the start and both properties; the rmi part is off 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.

[CVE-2016-2170] The infamous Java serialization vulnerability

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736083 13f79535-47bb-0310-9956-ffa450edef68
2016-03-21 20:17:59 +00:00
Jacques Le Roux b021268fa7 Fixes "Comment out RMI related code because of the Java deserialization issue" - https://issues.apache.org/jira/browse/OFBIZ-6942
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
2016-03-18 10:38:04 +00:00
Jacopo Cappellato f16d1f0717 OFBIZ-6568 With the implementation of @BaseScript annotations (introduced with Groovy 2.3.0) something was broken in the CompilerConfiguration.setScriptBaseClass method and an error is thrown when our scripts are executed; the workaround is to execute at startup a script containing the @BaseScript annotation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729809 13f79535-47bb-0310-9956-ffa450edef68
2016-02-11 11:24:51 +00:00
Jacques Le Roux 0bd172fafc Completes r1709882 for <<Possible static XSS issue with Content>> https://issues.apache.org/jira/browse/OFBIZ-6669
As explained in OFBIZ-6669 last comments, contrary to what I did in ContentWorker class, when I before did the work on *ContentWrapper classes I did not use the sanitizer but only an encoder (either HTML or URL).
Because I wrongly supposed that only plain text was used there and certainly my lazy mind thought it was easier because of the URL encoderType to also handle.

When the encoderType is HTML, we now use the sanitizer in *ContentWrapper classes, and ContentWorker.java has also been adapted. 
For that I enhanced the UtilCodec class. The sanitizer is only used when HTML is requested, else the sanitize() method simply calls the encode() method.

I removed the content.sanitize property in content.properties and added a sanitizer.permissive.policy property in the new owasp.properties (in base config) with some explanations. This allows for more configuration.

I changed the line 85 in productsummary.ftl to use an HTML content wrapper, same in minilastviewedcategories.ftl. 
To be totally complete, we should change *lines like* in productsummary.ftl line 85 to use an HTML content wrapper.
Not easy to spot but anyway those not done will simply not totally show well, without any security impacts.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713634 13f79535-47bb-0310-9956-ffa450edef68
2015-11-10 13:40:22 +00:00
Jacques Le Roux 2e46227f59 This has slipped in inadvertently, removes to add in next commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713632 13f79535-47bb-0310-9956-ffa450edef68
2015-11-10 13:26:23 +00:00
Jacques Le Roux 5befa22833 A modified patch from Pierre Smits for "Display GeoPoint with map in WebTools" https://issues.apache.org/jira/browse/OFBIZ-6527
Currently only a list of geoPoints is shown. The user experience will improve when we not only show that, but a map as well.

jleroux: 
I refactored the js scripts in party editGeoLocation.ftl and added webtools GeoLocation.ftl into a new common GoogleGeoLocation.ftl template now included in both party editGeoLocation.ftl and webtools GeoLocation.ftl 
I also removed trailing blanks in common GeoLocation.ftl template. 
I also added a French label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713627 13f79535-47bb-0310-9956-ffa450edef68
2015-11-10 12:32:01 +00:00
Adrian Crum 8a85268f91 Grid widget cache settings are missing - https://issues.apache.org/jira/browse/OFBIZ-6405.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709111 13f79535-47bb-0310-9956-ffa450edef68
2015-10-16 20:55:20 +00:00
Taher A. Alkhateeb 62b0f73212 Translate the framework to Arabic
Another part of the translation of OFBiz to Arabic 
project found in JIRA OFBIZ-6432.

The commit translates the following files :
- framework/base/config/DateTimeLabels.xml
- framework/widget/config/conditional.xml

refs https://issues.apache.org/jira/browse/OFBIZ-6432


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682699 13f79535-47bb-0310-9956-ffa450edef68
2015-05-31 08:49:43 +00:00
Adrian Crum f5a0e74f27 Added comments for cache settings. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668351 13f79535-47bb-0310-9956-ffa450edef68
2015-03-22 10:27:58 +00:00
Jacques Le Roux b8ca5543c9 Changes in all labels files: <value xml:lang="(.*)_(.*)"> to <value xml:lang="$1-$2">
Changes also listLocales.ftl to show dashes rather than underscores

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Adrian Crum 91feff5f51 Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Jacopo Cappellato 9ce782f90b Removed a bunch of dependencies of Owasp Esapi classes after I realized (by studying the Esapi source files and the integration in OFBiz) that we were using a small part of that product; this made it possible to upgrade to the latest release of Owasp Esapi (2.1.0) without having to include a bunch of jars.
I had to comment out two lines in the unit tests because they were failing after the upgrade; still investigating on this.
This commit resolves OFBIZ-5343.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648747 13f79535-47bb-0310-9956-ffa450edef68
2014-12-31 17:31:16 +00:00
Jacques Le Roux 464fd93aec Implements "Improve the way FOP handles fonts notably for currency symbols" https://issues.apache.org/jira/browse/OFBIZ-5917
Adds
<auto-detect/>
in the fonts section of our fop.xconf

Adds the Google NotoSans font which is Apache licensed
* http://www.google.com/fonts/specimen/Noto+Sans
* https://www.google.com/get/noto/#/

Uses NotoSans as the default FOP font. For that puts the NotoSans font 4 files in framework/resources/fonts and add <directory>framework/resources/fonts/NotoSansFonts</directory> in fop.xconf
Renders ₹ in content/control/fonts.pdf as we do for €. Other symbols could be added later when needed, backed by Google NotoSans font...
Renders the NotoSans content/control/fonts.pdf  as we do for other main fonts

Adds the rupee symbol (₹) to antisamy-esapi.xml file like we have the euro symbol (€)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647782 13f79535-47bb-0310-9956-ffa450edef68
2014-12-24 13:45:03 +00:00
Jacques Le Roux 5e6077d737 Adds the rupee symbol (₹) to antisamy-esapi.xml like we have the euro symbol(€)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646781 13f79535-47bb-0310-9956-ffa450edef68
2014-12-19 15:56:21 +00:00
Jacques Le Roux d6c2d35d34 Inconsistencies related to the "java -jar ofbiz.jar" commands when used with arguments https://issues.apache.org/jira/browse/OFBIZ-5872
The help gives you:
c:\projectsASF\ofbiz>java -jar ofbiz.jar -help

Usage: java -jar ofbiz.jar [command] [arguments]
-both    -----> Run simultaneously the POS (Point of Sales) application and OFBiz standard
-help, -? ----> This screen
-install -----> Run install (create tables/load data)
-pos     -----> Run the POS (Point of Sales) application
-setup -------> Run external application server setup
-start -------> Start the server
-status ------> Status of the server
-shutdown ----> Shutdown the server
-test --------> Run the JUnit test script
[no config] --> Use default config
[no command] -> Start the server w/ default config

But actually only the -help, -status and -shutdown command need a dash. 

For now we decided to change the documentation generated by the help command to remove dashes when they are not needed.

To change 
-install -----> Run install (create tables/load data)
by
-load-data -----> Create tables/load data

To comment out the 
-setup -------> Run external application server setup
line

When done, we will try to have things consistent and re-add the missing dashes to the commands and in the help. Then the "Technical production setup guide" should be updated, pfew...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1640588 13f79535-47bb-0310-9956-ffa450edef68
2014-11-19 16:27:49 +00:00
Jacopo Cappellato 66daa32f1a Cleaned up and inproved the code that integrates Groovy in the OFBiz framework:
* Groovy services and Groovy events now use the same util methods from GroovyUtil to parse/execute the scripts
* the script base class is now specified in the base/config/groovy.parameter file rather than in the serviceengine.xml
* the same util methods (DSL) are now available to all Groovy scripts (executed as services, events or widget actions)
* removed a series of unused methods in the GroovyUtil class



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1636346 13f79535-47bb-0310-9956-ffa450edef68
2014-11-03 13:15:29 +00:00
Jacopo Cappellato 99a72aff4a Some modifications to the default configuration of log4j2:
1) added a comment to summarize the default configuration, with a reference to the online log4j2 documentation for further customizations
2) added a new appender for errors (or greater); implemented using a filter to keep the logger definition as clean as possible
3) removed the external appender because the amount of log statements (warnings or greater) from external jars is not large and should not cause much confusion if we keep them with OFBiz log statements
4) increased the number of rolling files for ofbiz.log to 10
5) changed date format to "yyyy-mm-dd hh:mm:ss.sss"


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1633550 13f79535-47bb-0310-9956-ffa450edef68
2014-10-22 07:50:08 +00:00
Jacques Le Roux c19e450091 As suggested by Jacopo on dev ML moves the README file related to SSL certificate from framework/base/README to framework/base/config/README
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626881 13f79535-47bb-0310-9956-ffa450edef68
2014-09-22 19:48:37 +00:00
Jacopo Cappellato 91573e60fb Attempt to improve the code that setups the Tomcat instance, the engine, hosts and contexts: this is still a work in progress but at least now the Tomcat instance is initialized without warning messages as was before.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626060 13f79535-47bb-0310-9956-ffa450edef68
2014-09-18 19:48:01 +00:00
Jacques Le Roux 3b118d4842 An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
added/revised zh-TW translations in the framework, applications and specialpurpose folders to have consistent, commonly-used meaningful terms in Traditional Chinese.

jleroux: from Nick Ho's patch I have extracted only the Chinese changes, w/o the proposed  dash to underscore changes
This contains notably this 14 "zh" (not "sh-TW") changes:
<value xml:lang="zh">人将由电子邮件接受一个临时密码。</value><!-- was 客户将通过电子邮件收到一个临时密码。 -->
<value xml:lang="zh">合计属于公司: </value>
<value xml:lang="zh"> 完整文本:${fullText}</value>
<value xml:lang="zh">供货商佣金百分比</value>
<value xml:lang="zh">文本大小</value>
<value xml:lang="zh">值</value>
<value xml:lang="zh">算子</value>
<value xml:lang="zh">不能转移已序列化的库存。</value>
<value xml:lang="zh">货运收据</value>
<value xml:lang="zh">获取标识为 ${productStoreShipMethId} 的产品店铺送货方法(ProductStoreShipmentMeth)时出错:${errorString}</value>
<value xml:lang="zh">中国人民币元</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现文本框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh">文本消息</value>
<value xml:lang="zh">能够收到和解析XML消息,但是BSR->NOUN(买卖关系->名词) ${bsrNoun} 和/或 BSR->VERB(买卖关系->动词) ${bsrVerb} 是空的</value>
I have no competency to judge these changes, but from previous Shi Jinghai's feedback I believe there are OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625816 13f79535-47bb-0310-9956-ffa450edef68
2014-09-17 20:44:07 +00:00
Jacopo Cappellato 2b384efa04 Increased the length of the logger column from 20 to 30 characters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621701 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 08:29:28 +00:00
Jacopo Cappellato d8c412302f OFBIZ-5287: Upgrade to Log4j2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618831 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 10:36:01 +00:00
Jacques Le Roux 0f31bcb2a0 Adds a new self signed SSL certificate created on the OFBiz demo VM with own CA following http://httpd.apache.org/docs/current/ssl/ssl_faq.html#realcert
This certificate is valid for 10 years (until May 27 08:43:19 2024 GMT)
Characteristics: C=US, ST=DE, L=Wilmington, O=Apache Software Fundation, OU=Apache OFBiz, CN=ofbiz-vm.apache.org/emailAddress=dev@ofbiz.apache.org
The password is still the same: changeit, I checked: HTTPS works locally

I don't really understand the content and the need of framework/base/cert/ so I only added framework/base/cert/demoCA/newcerts/03.pem and framework/base/cert/README which explains this change


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1598544 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 10:46:54 +00:00