Commit Graph
10472 Commits
Author SHA1 Message Date
Michael Brohl 302195327b Applied patch for OFBIZ-6971: Remove dead imports.
Remove all unnecessary import statements in all java files. Taken from the Refactor ToDo list at https://cwiki.apache.org/confluence/display/OFBIZ/Re-Factor+To-Do+List .

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737636 13f79535-47bb-0310-9956-ffa450edef68
2016-04-04 08:31:08 +00:00
Michael Brohl eaafbb0779 Applied patch for OFBIZ-6972: Fix resource leaks in CommonServices.java.
File1 and file2 should be fixed by closing them in byteBufferTest. Taken from refactor todo list at https://cwiki.apache.org/confluence/display/OFBIZ/Re-Factor+To-Do+List .

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737631 13f79535-47bb-0310-9956-ffa450edef68
2016-04-04 08:16:59 +00:00
Jacques Le Roux 1e7d539a7a Removes old simple-methods.xsd from the trunk as it's useless now (was replaced by simple-methods-v2.xsd)
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
2016-03-30 09:13:03 +00:00
Jacques Le Roux a2ec1cbb64 Removes simple-methods.xsd from the catalog, it's no longer used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737078 13f79535-47bb-0310-9956-ffa450edef68
2016-03-30 06:00:25 +00:00
Jacques Le Roux eff5999d61 A patch from James Yong for <<Unable to change language in ecommerce>> https://issues.apache.org/jira/browse/OFBIZ-6966
Problem
=======
Go to http://localhost:8080/ecommerce/
Change the language dropdown from English to another language will revert back to English. I am using SVN revision 1735923

jleroux: This was due to  OFBIZ-6879 ("Remove forceHttpSession feature"). Now as soon as you start with HTTPS instead of HTTP it works. I mean other links don't get back on HTTP, see OFBIZ-6966 for details... More to come with OFBIZ-6849, hopefully soon...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737046 13f79535-47bb-0310-9956-ffa450edef68
2016-03-29 20:44:30 +00:00
Scott Gray 393de88042 Ensure a ModelField is set for rhs EntityConditionValues that don't already have it, such as the EntityFunction classes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736922 13f79535-47bb-0310-9956-ffa450edef68
2016-03-28 20:13:54 +00:00
Jacques Le Roux d71ba4d6cc Fixes an issue with css images path in ecommain.css reported by James Yong at https://issues.apache.org/jira/browse/OFBIZ-6961
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736854 13f79535-47bb-0310-9956-ffa450edef68
2016-03-28 10:10:03 +00:00
Jacques Le Roux 2f43c5a993 Patches from Pierre Smits for <<Enhancing *Attribute entities with a description field>> https://issues.apache.org/jira/browse/OFBIZ-6962
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736846 13f79535-47bb-0310-9956-ffa450edef68
2016-03-28 09:31:53 +00:00
Jacques Le Roux a725bd4db7 Fixes "Update XStream lib to prevent XML External Entity (XXE) Processing" - https://issues.apache.org/jira/browse/OFBIZ-6959
The XStream team has released the 1.4.9 stable version in March 15, 2016
This version fixes the XML External Entity (XXE) Processing security issue https://www.owasp.org/index.php/XML_External_Entity_%28XXE%29_Processing
Since OFBiz uses the DomDriver, with Java 6 at least in supported releases, OFBiz seems not really vulnerable https://x-stream.github.io/faq.html#Security_XXEVulnerability, but better to be safe than sorry, notably for not OOTB uses...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736434 13f79535-47bb-0310-9956-ffa450edef68
2016-03-24 12:12:11 +00:00
Deepak Dixit 64ef408374 Removed extra unused sign from start.properties file, I think its mistakenly committed at r#1736083.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736272 13f79535-47bb-0310-9956-ffa450edef68
2016-03-23 05:23:41 +00:00
Nicolas Malin d40919bdb9 correct typo on javadoc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736222 13f79535-47bb-0310-9956-ffa450edef68
2016-03-22 18:08:26 +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
Nicolas Malin 2aa9aaf3f4 For screen engine drop-down, sort with the locale the entity-list if the related entity have a default resource defined.
This work also with view entity. Relate issue OFBIZ-3311

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735741 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 09:01:40 +00:00
Gil Portenseigne d58d3a2fbf OFBIZ-6927
Add width and height attributes retrieval in renderLink method in MacroMenuRenderer. Thanks Pierre for the report.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735738 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 08:08:50 +00:00
Nicolas Malin f27504a3a0 Related to the thread http://ofbiz.135035.n4.nabble.com/entity-auto-and-cancel-operation-td4676929.html on the dev mailing list and the issue OFBIZ-6892, this commit manage the action expire on entity-auto engine.
When you call expire on a entity :
 * if a date field is present on service attribute, OFBiz try to expire it with the given value or with now date
 * else try to expire thruDate field
 * else try to expire *ThruDate or thru*Date field
With the new action I refactoring the code to separate each action on dedicate function.
the unit test associate to expire action was updated.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735737 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 08:04:16 +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 1247c39d15 Improved the documentation about the purpose and behavior of the "auth" and "in-validate" secas events.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735441 13f79535-47bb-0310-9956-ffa450edef68
2016-03-17 15:00:47 +00:00
Christian Geisert 7156d8fbe2 OFBIZ-6936 Fix broken 'run-test-list' target
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735244 13f79535-47bb-0310-9956-ffa450edef68
2016-03-16 15:38:04 +00:00
Shi Jinghai 6910aacd54 OFBIZ-6755 Update the passport component to use httpclient/core-4.4.1 instead of commons-httpclient-3.1
1. Remove commons-httpclient-3.1.jar from passport component.
2. Use httpclient 4.4.1 in base/lib instead.
3. Remove randomString methods, use RandomStringUtils.randomAlphanumeric instead.
4. Move getAllowAllHttpClient to UtilHttp.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735021 13f79535-47bb-0310-9956-ffa450edef68
2016-03-15 06:06:33 +00:00
Jacques Le Roux f108def5a8 Fixes "Update Tomcat to 7.0.68" - https://issues.apache.org/jira/browse/OFBIZ-6913
The 22/Feb/16 the Apache Tomcat Security Team revealed some security issues, we need to update Tomcat to 6.0.68 version
https://tomcat.apache.org/security-7.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1734912 13f79535-47bb-0310-9956-ffa450edef68
2016-03-14 10:58:39 +00:00
Hans Bakker 10c844b687 improve uom convert error message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1734875 13f79535-47bb-0310-9956-ffa450edef68
2016-03-14 02:37:12 +00:00
Jacques Le Roux 1c0466616e A patch from Forrest Rae for "GroovyEngine.serviceInvoker masks Groovy script exceptions in some cases" https://issues.apache.org/jira/browse/OFBIZ-6888
If GroovyEngine.serviceInvoker catches an exception in a Groovy script, it would mask the exception in some cases.  An exception's detailMessage can be null.  If it is null, the exception won't be properly returned and logged, and that will make spotting problems very difficult.  This was the case for me while trying to track down a problem with a java.util.ConcurrentModificationException error in a Groovy script.  I suspect that this choice to mask exceptions and only return the message has cause bugs to not be spotted.

Disabling this for now in favor of returning a proper exception.  GroovyEngine.serviceInvoker() should throw GenericServiceException if error, rather than returning ServiceUtil.returnError(e.getMessage())



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1734269 13f79535-47bb-0310-9956-ffa450edef68
2016-03-09 15:36:56 +00:00
Jacques Le Roux 3458a46b24 A patch from Oleg Andreyev for "Incorrect content length in response from HTTP service engine" https://issues.apache.org/jira/browse/OFBIZ-6925
Obvious error that cause deserialization errors on receiving side under some conditions because data extracted from response shorter than it really was sent. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1734246 13f79535-47bb-0310-9956-ffa450edef68
2016-03-09 14:40:33 +00:00
Jacques Le Roux 05667aa340 Adds a comments to the testRemoteSoap service to clarify when to use it how it works.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1734241 13f79535-47bb-0310-9956-ffa450edef68
2016-03-09 13:57:39 +00:00
Jacques Le Roux e576d72fc8 "Upgrade Axis2 to 1.7.0" - https://issues.apache.org/jira/browse/OFBIZ-6916 - Actually this upgrades Axis2 to 1.7.1
Replacing Axis2 1.6.3 by 1.7.1 version is easy as long as you don't try to replace the commons-httpclient-3.1 lib. The only noticeable change is this warning shown in log
    |http-bio-8443-exec-1 |AxisConfigBuilder             |W| Unable to instantiate deployer org.apache.axis2.deployment.ServiceDeployer; see debug logs for more details|
It has no effects on the SOAP test services, both works.

But the main goal of this issue is a security update because commons-httpclient-3.1 lib is deprecated, no longer maintained and vulnerable and must be replaced.

This commit also concerns OFBIZ-6755 but to not mix things OFBIZ-6755 will be completed later. So to not block this issue, the commons-httpclient-3.1 lib is moved from framework/service/lib to specialpurpose/passport/lib/ where it's still required.

Normally, as explained at https://axis.apache.org/axis2/java/core/release-notes/1.7.0.html, Axis2 1.7.1 requires "HttpClient 4.2.x and should work with 4.3.x and 4.4.x, but is incompatible with 4.5.x". I did not replace commons-httpclient-3.1 by HttpClient 4.2.1, which is bundled with Axis2 1.7.1, because we have already HttpClient/Core 4.4.1 in base/lib and it works well as is (HttpClient/Core 4.4.1 is in the classpath).

To use HttpClient/Core 4.4.1 you need to change the axis2.xml files as specified in the 1.7.0 release note. But where to place this file in OFBiz is not obvious! 

I decided the best way was to use Axis2 ConfigurationContextFactory.createConfigurationContextFromFileSystem() method to let know Axis2 we want the new httpclient instead of the default one (I really don't understand why the Axis2 team still prefers commons-httpclient-3.1 as default). I had to pass both locations to avoid hardcoding the repository location in the axis2.xml file.

I have also decided the best place for the "Axis2 repository" (as they call it) was in framework/service/axis2. So following Axis2 convention http://wso2.com/library/tutorials/axis2-repository/ I put the axis2.xml file in framework/service/axis2/conf.
Note: the Axis2 repository could be used to put [Apache Rampart|https://axis.apache.org/axis2/java/rampart/] as a module to secure web services...

After this change, there are a number of warnings thrown by Axis2 but they are actually interesting as they provide guidance for future use of modules and such (notably Apache Rampart)
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher
    |ttp-bio-8443-exec-10 |Utils                         |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher
    |ttp-bio-8443-exec-10 |AxisConfigBuilder             |W| Unable to instantiate deployer org.apache.axis2.deployment.ServiceDeployer; see debug logs for more details
    |ttp-bio-8443-exec-10 |AxisConfigBuilder             |W| Unable to instantiate deployer org.apache.axis2.jaxws.framework.JAXWSDeployer; see debug logs for more details


While at it I replaced StAXOMBuilder (deprecated) by OMXMLBuilderFactory

I will backport the changes in the supported releases branches but R12.04 which use a too old version of HttpClient/Core. Others all use versions older than 4.2.1. I'm aware I will have to handle several conflicts by hand, some are easy others "harder". We have the passport component only in R15.12, it will be easy to neglect in older releases. I expect more work with the LICENSE file and even more with the .classpath file. Since R15.12 we use tabs in it (Adrian rightly told us to use Eclipse internal tools to edit this file, though I noted it does not respect the alphabetical order) but older releases still use spaces (and this is often a pain now, but a bright future ahead ;))

Crossing fingers with this commit, I have other changes pending in this instance (notably for OFBIZ-6849) and it got quite complicated...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1733956 13f79535-47bb-0310-9956-ffa450edef68
2016-03-07 18:48:14 +00:00
Jacques Le Roux 2c79c094ea "Currently the testRemoteSoap test services does not work." - https://issues.apache.org/jira/browse/OFBIZ-6922
This temporarily replaces the demo-trunk.ofbiz.apache.org domain by ofbiz-vm.apache.org:8080

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1733951 13f79535-47bb-0310-9956-ffa450edef68
2016-03-07 18:14:53 +00:00
Jacques Le Roux d6bc5e655e Reverts Revision: 1732631
This was a test for "Upgrade Axis2 to 1.7.0" - https://issues.apache.org/jira/browse/OFBIZ-6916 and failed: needs more work...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1732637 13f79535-47bb-0310-9956-ffa450edef68
2016-02-27 13:12:10 +00:00
Jacques Le Roux a5af814695 This is a test for "Upgrade Axis2 to 1.7.0" - https://issues.apache.org/jira/browse/OFBIZ-6916
It's a security update. It also concerns OFBIZ-6755 but to not mix things it will be done later. So to not block this issue, the commons-httpclient-3.1 lib is moved from framework/service/lib to specialpurpose/passport/lib/ where it's still required (no code change in this commit, only libs update)

It's a test because I began this work on Windows and there the NTML Auth is expected https://axis.apache.org/axis2/java/core/docs/http-transport.html#preemptive_auth. So, on my machine, I get this error with testSOAPSimpleService and testSOAPService:

TestRunContainer              |W| [JUNIT (error)] - testSOAPSimpleService : org.ofbiz.service.GenericServiceException: Service [testSoapSimple] Failed (org/apache/commons/httpclient/NTCredentials)
Caused by: java.lang.NoClassDefFoundError: org/apache/commons/httpclient/NTCredentials
	at org.apache.axis2.transport.http.CommonsHTTPTransportSender.createHTTPSender(CommonsHTTPTransportSender.java:414) ~[axis2-transport-http-1.7.0.jar:1.7.0]


Since I don't want to introduce more complexity at this stage I hope the basic Auth will be used in BuildBot and the tests will all pass. Else I will revert and do more work...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1732631 13f79535-47bb-0310-9956-ffa450edef68
2016-02-27 12:28:08 +00:00
Jacques Le Roux 372a6d7582 I made an error while naming Tomcat extras files at r1717760. This fixes it including .classpath file - Tomcat 7.0.65 - OFBIZ-6752
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1732570 13f79535-47bb-0310-9956-ffa450edef68
2016-02-26 22:41:03 +00:00
Deepak Dixit 94eefdcb72 OFBIZ-6278: Merged changes done at 1675464, 1675465 and 1675466 from OFBIZ-6275 branch to trunk.
Log:
==========================================================
- Make use of ResourceLoader.readXmlRootElement, which is
non-caching; this fixes a deprecation warning.
- Use ResourceLoader.readXmlRootElement, which is a
non-caching version.  This fixes a deprecation warning.
- Provide method variants (readXml{Document,RootElement}) that contain the body of the deprecated methods (getXml{Document,RootElement}).
==========================================================


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731399 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 13:16:03 +00:00
Deepak Dixit 06dbe2a87c (OFBIZ-5780) Removed deprecated warning from FoFormRender as we don't have support to create MacroFormRender object in services.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731392 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 12:45:19 +00:00
Arun Patidar 4f484099a8 [OFBIZ-6909] Applied patch for adding a new fieled 'disabledBy' in UserLogin entity.Thanks Yashwant for reporting issue and patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731390 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 12:35:31 +00:00
Deepak Dixit 5a1f3c9dda OFBIZ-6284: Merged changes done at r#1675520 in OFBIZ-6275 branch into Trunk.
Log:
===========================================================
Fix deprecated use of
SimpleMethod.getAll{Entity,Service}NamesUsed(), instead 
using ArtifactInfoContext.
============================================================


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731387 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 12:19:15 +00:00
Deepak Dixit c8add13c70 OFBIZ-6279: Migrated changes from r1675462 to Trunk.
Log:
============================================================
UtilDateTime implements deprecated methods, so add the
@Deprecated tag to stop javac from producing a warning.
============================================================

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731385 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 12:11:01 +00:00
Deepak Dixit 51cb141c5e OFBIZ-6277: Merge changes from r1675521 to Trunk:
Log:
============================================================
new Configuration() is deprecated; instead, the desired
freemarker version should be passed in.  To make it easier to control
the version centrally, add a helper method on FreeMarkerWorker that
wraps the instantiation of the Configuration object.
============================================================


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731380 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 12:01:23 +00:00
Deepak Dixit 10886a0252 (OFBIZ-5780) Fixed some compilation warning:
- Mark some SecurityFactory method as deprecated 
- Mark FoFormRender as deprecated
- Fixed deprecation warning for PassportUtil class.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731377 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 11:46:08 +00:00
Deepak Dixit 6030811211 (OFBIZ-6281) Replace html widget rendering with Macro widget rendering in framework/widget files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731366 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 10:26:25 +00:00
Deepak Dixit 0e05930bea (OFBIZ-6283) Replace html widget rendering with Macro widget rendering in FoPrintServerEvents.java file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731361 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 10:14:51 +00:00
Deepak Dixit 9e29f0d9fb (OFBIZ-6282) Replace html widget rendering with Macro widget rendering in EmailServices.java file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731343 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 08:48:31 +00:00
Jacques Le Roux 354260caff In framework/base/lib/ updates Xalan from 2.7.1 to 2.7.2 because of CVE-2014-0107 (was fixed at XALANJ-2435) - https://issues.apache.org/jira/browse/OFBIZ-6905
This implies to update also Xerces from 2.9.1 to 2.11.0 and also xml-apis from 2.9.1 to 1.4.01 (2.9.1 was a wrong version number. It was actually part of the Xerces 2.9.1 package but I was unable to find the real version number then at https://xerces.apache.org/xerces2-j/releases.html)

Also updates Xalan from 27(?) to 2.7.2 in cmssite/template/docbook/extensions. I rendered https://localhost:8443/cmssite/cms/APACHE_OFBIZ_HTML w/o issues
	
Note: According to the DOM Level 3 specification and DOM Level 2 errata the createElementNS and createAttributeNS methods convert empty string namespaceURI to null. 

jleroux: though the tests pass I'm not sure all is covered...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1730882 13f79535-47bb-0310-9956-ffa450edef68
2016-02-17 17:29:40 +00:00
Jacques Le Roux 612d0f6cd7 DB2 example based on http://markmail.org/message/ez55yv5m36liliue - OFBIZ-1607
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1730616 13f79535-47bb-0310-9956-ffa450edef68
2016-02-15 21:39:27 +00:00
Jacques Le Roux f2d6d27b6a A patch from Oleg Andreyev for "Error during first attempt of the synchronisation" https://issues.apache.org/jira/browse/OFBIZ-6893
Trivial error due to incorrect parameters passed to EntityQuery.where()


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1730035 13f79535-47bb-0310-9956-ffa450edef68
2016-02-12 15:03:48 +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
Jacopo Cappellato b0bbe4d430 OFBIZ-6568: upgraded Groovy to the latest version (2.4.5).
[CVE-2016-2170] The infamous Java serialization vulnerability


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729609 13f79535-47bb-0310-9956-ffa450edef68
2016-02-10 14:38:00 +00:00
Jacques Le Roux 806be00fc5 No functional change: I put a dot just before, so better with a Capital!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729349 13f79535-47bb-0310-9956-ffa450edef68
2016-02-09 10:31:28 +00:00
Jacques Le Roux 9d58ec2a48 Implements "Hide sessionId in logs by default, show them using a properties" - https://issues.apache.org/jira/browse/OFBIZ-6886
There are few cases where we show the sessionId in logs (using UtilHttp.getSessionId()  in or HttpSessionEvent.getSession().getId()) in other places)
Despite we secured the log access at r1489461, I feel better using a properties to opt in, false by default.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729348 13f79535-47bb-0310-9956-ffa450edef68
2016-02-09 10:26:26 +00:00
Jacques Le Roux 327fb83021 A patch from Tomas Pytelka for "Czech translation" https://issues.apache.org/jira/browse/OFBIZ-6885
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
2016-02-08 07:56:23 +00:00
Jacques Le Roux adb90faef8 A modified patch from Pierre Smits for "Replace Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue in .ftl files with EntityUtilProperties variant" https://issues.apache.org/jira/browse/OFBIZ-6884
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
2016-02-07 18:23:49 +00:00
Jacques Le Roux c19af8a60b Reverts r1728959 because of misc. issues with the patch, see my comment at https://issues.apache.org/jira/browse/OFBIZ-6884
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728961 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 13:59:41 +00:00
Jacques Le Roux 3a5cc393cf A patch from Pierre Smits for "Replace Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue in .ftl files with EntityUtilProperties variant" https://issues.apache.org/jira/browse/OFBIZ-6884
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
2016-02-07 13:18:50 +00:00