Commit Graph
10472 Commits
Author SHA1 Message Date
Scott Gray 1d03a846a3 Add cache(boolean) method to EntityQuery to allow the cache to be used or not based on a boolean variable. Avoids the need to use an if block when the caching decision isn't hardcoded
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629782 13f79535-47bb-0310-9956-ffa450edef68
2014-10-06 22:48:40 +00:00
Scott Gray a7d534f589 Add EntityQuery support for filtering by one or more explicit from/thruDate field pairs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629538 13f79535-47bb-0310-9956-ffa450edef68
2014-10-05 20:28:25 +00:00
Nicolas Malin e775c0de17 Convert CRUD service to entity-auto for GoodIdentification, ProductAttribute, ProductGeo, ProductMeter, ProductMaint, ProductGlAccount, ProductAssoc and ProductKeyword. For this last, add StatusValidChange data for keyword to autorize from status KW_PENDING to KW_APPORVED and from status KW_PENDING to KW_DISAPPROVED. Related issue OFBIZ-5734
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629523 13f79535-47bb-0310-9956-ffa450edef68
2014-10-05 19:34:17 +00:00
Adrian Crum 1c27aea03e Fixed a bug in GenericDelegator where stack traces were logged when a sequence name didn't match an entity name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629391 13f79535-47bb-0310-9956-ffa450edef68
2014-10-04 13:30:12 +00:00
Adrian Crum a9e240b333 Fix JavaDoc - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629388 13f79535-47bb-0310-9956-ffa450edef68
2014-10-04 13:19:11 +00:00
Adrian Crum c708db0104 Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629385 13f79535-47bb-0310-9956-ffa450edef68
2014-10-04 13:02:45 +00:00
Adrian Crum 13f5288e84 Fixed a bug in Mini-language <field-to-result> element where nested expressions were not evaluated correctly. Reported by Jacopo on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1629382 13f79535-47bb-0310-9956-ffa450edef68
2014-10-04 12:52:48 +00:00
Jacques Le Roux 9e683b1655 Fixes a typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1628986 13f79535-47bb-0310-9956-ffa450edef68
2014-10-02 14:53:01 +00:00
Jacopo Cappellato 81f333f845 Fixed a trivial typo.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1628971 13f79535-47bb-0310-9956-ffa450edef68
2014-10-02 13:46:50 +00:00
Jacopo Cappellato a67d04c2ee Removed deprecated methods in the widget API; cleaned up a bunch of old commented out code; fixed formatting issues; some minor code improvements (no functional changes).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1628361 13f79535-47bb-0310-9956-ffa450edef68
2014-09-30 06:20:29 +00:00
Scott Gray fcd7797209 Improved generics for where(List) so that a list of EntityExpr will be accepted. Fixes an issue where the runtime would select the where(Object...) method for a List of EntityExpr objects.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1628287 13f79535-47bb-0310-9956-ffa450edef68
2014-09-29 20:12:04 +00:00
Jacopo Cappellato 3b8baced92 Upgraded freemarker to 2.3.21-rc02.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1628130 13f79535-47bb-0310-9956-ffa450edef68
2014-09-29 07:37:46 +00:00
Scott Gray b0dbf709fa OFBIZ-4053 Implement an entity query builder to be used as a friendlier API for executing entity queries.
Entry point is the static EntityQuery.use(Delegator) method which will then return an EntityQuery instance whose methods support method chaining to set query options.
The query can then be executed using the first(), list(), iterator() and one() methods which respectively return:
- The first result from a result set
- The full list of results from a result set
- An EntityListIterator to iterate over a result set
- The single record from a query that will return only one record (such as a lookup by primary key)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627940 13f79535-47bb-0310-9956-ffa450edef68
2014-09-27 09:22:31 +00:00
Jacopo Cappellato 732855faa3 Because of the "negate" attribute the entity-test.jar used to contain all the non-test classes (already in entity.jar).
This fix should be the right way to go but please review this commit because the syntax of these custom ant tasks is rather cryptic to me.
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627818 13f79535-47bb-0310-9956-ffa450edef68
2014-09-26 15:57:22 +00:00
Jacopo Cappellato 1084f48cdb JUnit test to prove that field-to-result doesn't work properly when result-name contains the a ${} field.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627718 13f79535-47bb-0310-9956-ffa450edef68
2014-09-26 06:56:27 +00:00
Jacopo Cappellato 19d7606913 Use the default value of the Tomcat connectors for the enableLookups parameter: this is false by default.
From Tomcat connector configurator documentation:
enableLookups
Set to true if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. Set to false to skip the DNS lookup and return the IP address in String form instead (thereby improving performance). By default, DNS lookups are disabled.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627490 13f79535-47bb-0310-9956-ffa450edef68
2014-09-25 09:03:48 +00:00
Jacopo Cappellato 1bf6f051a5 Based on review and comments from Adrian Crum, re-added the max-worker-pool-size element (that was removed as part of the changes in commit 1627092) but with a new implementation that preserves all the cleanups done in rev. 1627092.
This new implementation should be slightly more flexible but with default setup will end up with the same behavior as before 1627092.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627489 13f79535-47bb-0310-9956-ffa450edef68
2014-09-25 08:55:42 +00:00
Jacques Le Roux 6e717f7bd0 A patch from Leon for "HttpClient does not support charset name with quotation mark around" https://issues.apache.org/jira/browse/OFBIZ-5787
In RFC2045 (Section 5.1) there is:
"Content-type: text/plain; charset=us-ascii (Plain text)
Content-type: text/plain; charset="us-ascii"
are completely equivalent".

In current revision, if the 'Content-Type' of http response includes the quotation mark around the charset name, HttpClient throws out unsupported encoding exception.

This patch removes quotation marks from charset name extracted from http response header.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627230 13f79535-47bb-0310-9956-ffa450edef68
2014-09-24 06:40:46 +00:00
Jacopo Cappellato adc41ad5bf Moved the thread pool executor object from GenericDAO to the DatabaseUtil class where it was actually used: this change simplifies the API and allows to shutdown the pool when it is no more needed.
Removed a series of methods that are no more needed after this refactoring or were not used.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627092 13f79535-47bb-0310-9956-ffa450edef68
2014-09-23 17:04:20 +00:00
Jacopo Cappellato c2b09a6027 Removed an old an unused class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1627001 13f79535-47bb-0310-9956-ffa450edef68
2014-09-23 13:12:49 +00:00
Jacopo Cappellato d4c5b5112a Small code enhancement: use FixedThreadPool to run the "pulse" worker threads.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626993 13f79535-47bb-0310-9956-ffa450edef68
2014-09-23 12:59:13 +00:00
Jacopo Cappellato f14003d799 Removed a bunch of never used classes from the base/concurrent package.
Provided better settings for the thread pools to avoid to keep alive threads that are only needed at startup.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626977 13f79535-47bb-0310-9956-ffa450edef68
2014-09-23 10:52:29 +00:00
Jacopo Cappellato 3e5b24806e Removed some code that was not used by the CatalinaContainer.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626971 13f79535-47bb-0310-9956-ffa450edef68
2014-09-23 09:24:37 +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
Jacques Le Roux 6833c2acd4 We agreed with Jacopo that the framework/base/cert directory is more misleading than helping. So this removes it.
I though keep the slightly expurgated README file for the sake of certificates creation history. I move it to framework/base

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626874 13f79535-47bb-0310-9956-ffa450edef68
2014-09-22 19:17:45 +00:00
Jacopo Cappellato bac3fd452f Explicitly setting the keyPass and keyAlias to the Tomcat connector: this is similar to keystorePass but is more flexible when the keystore contains multiple values.
In the log info, don't print the content of Connector parameters that may contain a password. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626677 13f79535-47bb-0310-9956-ffa450edef68
2014-09-22 07:19:41 +00:00
Jacopo Cappellato 2f234a01af Further improvements to the way we use the Tomcat startup API: removed the deprecated (will be removed in Tomcat 8) memory realm (not really used in OFBiz) and a series of minor adjustments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626531 13f79535-47bb-0310-9956-ffa450edef68
2014-09-21 06:23:57 +00:00
Anil Patel 5d95b3522e [OFBIZ-5711] Nice catch. Thanks Rong Nguyen for reporting and Deepak Dixit for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626464 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 15:53:08 +00:00
Ashish Vijaywargiya 3aee9fc009 Applied bug fix from jira issue - OFBIZ-254 - Noisy, Possibly Unnecessary Logging when a browser request is cancelled by the user.
Thanks Jacopo for reporting the issue and thanks Pranay for the contribution. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626458 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 15:33:34 +00:00
Ashish Vijaywargiya 44bc632d5a Applied patch from jira issue - OFBIZ-1524 - Improve the way CreditCard.cardType field is managed.
Thanks Akash Jain for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626425 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 12:16:37 +00:00
Ashish Vijaywargiya 7859237729 Applied bug fix from jira issue - OFBIZ-5773 - <@htmlTemplate.renderDateTimeField> icon buttons disappear on some pages after refresh.
Thanks Akash Jain for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626419 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 11:14:02 +00:00
Ashish Vijaywargiya c8cd3615e4 Applied patch from jira issue - OFBIZ-5769.
web.xml: empty allowPaths init param causes NPE
Thanks Deepak Dixit for the contribution. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626384 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 06:02:55 +00:00
Jacopo Cappellato 7ad9702ecb Trivial change to the format of an INFO message in order to be consistent with the format of the logs produced by the ServiceDispatcher.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626125 13f79535-47bb-0310-9956-ffa450edef68
2014-09-19 04:49:45 +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
Jacopo Cappellato e0fc2b318c Simplified and improved the logic to setup the Tomcat connectors: the logic was overly complex and messed up (probably after all the various upgrades to new Tomcat versions), there were a series of parameters that could not be set, some hardcoded values, some old and no more used (by Tomcat) parameters.
Improved the information logged about the actual parameters set for the connectors.
Removed Javolution from CatalinaContainer.
Cleaned up the connector configuration file: removed no more used parameters, commented out some parameters (that didn't change the default), commented out some parameters in order to use the Tomcat default values that may improve the performance (e.g. maxThreads in OFBiz was set to a lower value than the default one of newer Tomcat releases and this limits the throughput in default OFBiz setups), updated URLs to Tomcat documentation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625919 13f79535-47bb-0310-9956-ffa450edef68
2014-09-18 09:00:15 +00:00
Jacques Le Roux 85244180eb Finally keeps Release.revision date simple in footer as suggested by Scott on Dev ML
No needs to over-engineering things there. A bit more smart than before though
This reverts r1625006 and r1624886 and adds CommonBuiltOn and better svninfo and gitinfo targets
I just regret that I lose the formatting effort I did in footer.ftl files, but I have not the guts to do it again.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625907 13f79535-47bb-0310-9956-ffa450edef68
2014-09-18 07:46:14 +00:00
Jacques Le Roux 5ebc58cc6a An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
jleroux: some changes I spotted in Nick Ho's patch which sounded sound to me. Some groups of label internal ending white spaces would have been caught by HTML rendering, but anyway better like that.
I also fixed a number of wrong line returns. And found duplicates zh labels entries that I will report to Nick Ho to fix. And finally fixed some errors introduced by Nick Ho I spotted, I hope there are not too much left :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625893 13f79535-47bb-0310-9956-ffa450edef68
2014-09-18 05:54:04 +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
Jacques Le Roux ce7805dd45 Better way for deployed-date-time ant target, now deployed-on
Still in discussion in dev ML, notably if we should backport

Put back the CommonDepth label inadvertently removed, thanks to Scott's review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625006 13f79535-47bb-0310-9956-ffa450edef68
2014-09-15 12:08:08 +00:00
Jacques Le Roux 7241a35012 No functional changes, better JavaDoc only
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625001 13f79535-47bb-0310-9956-ffa450edef68
2014-09-15 11:47:19 +00:00
Jacques Le Roux 70a364f81c Adds an isFile() method in FileUtil class.
It checks if the specified fileName exists and is a file (not a directory)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624996 13f79535-47bb-0310-9956-ffa450edef68
2014-09-15 11:02:35 +00:00
Jacques Le Roux ecfcd44d06 Adds deployed-date-time and clean-deployed-date-time targets. To set the date and time of last deployment info in the footer
Puts a check on svinfo and gitinfo (only used if it's a local copy)
Adds and uses CommonDeployedThe label in footer.ftl with the new deployed-date-time  target
Uses CommonPoweredBy in bizznesstime footer.ftl
Minor changes and formatting in the footer.ftl files
Better French label for CommonPoweredBy


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624886 13f79535-47bb-0310-9956-ffa450edef68
2014-09-14 17:56:34 +00:00
Jacques Le Roux 6a26060c20 No functional change, removes trailing blanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624817 13f79535-47bb-0310-9956-ffa450edef68
2014-09-14 08:53:33 +00:00
Jacques Le Roux ea994aee40 OFBIZ-5770 - Removes the harcoded ports related with service locations introduced with OFBIZ-4794
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624809 13f79535-47bb-0310-9956-ffa450edef68
2014-09-14 08:37:46 +00:00
Jacopo Cappellato c80170456d Fixed the regression that Jacques introduced with the work on portOffset when the immutability of ServiceLocation was broken; now the class is thread-safe again.
However the portOffset code, before and after my fix, is really ugly and should be reverted completely: the "8080" and "1099" ports, that are configurable in OFBiz, are hardcoded in the portOffset code and so this code can only work when OFBiz is executed with the default ports.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624767 13f79535-47bb-0310-9956-ffa450edef68
2014-09-13 17:05:03 +00:00
Jacopo Cappellato 1a71a69ea6 Removed the ClassLoaderContainer: it is no more used.
Moved the portOffset field from ClassLoaderContainer to the Start/Config class.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624700 13f79535-47bb-0310-9956-ffa450edef68
2014-09-13 06:57:02 +00:00
Jacopo Cappellato fa8115dba5 Removed the custom CachedClassLoader and related artifacts in favour of a simpler bootstrap process and a simpler classpath tree; now the classpath tree is made of: bootstrap classloader (primordial+ext) -> system classloader (aka applications or classpath classloader) -> two custom classloaders (one loads the framework/base classes and one loads all the other classes) -> Webapp classloaders (one per web application).
Junit tests are included. The two custom classloaders could be merged into one but this will be addressed in a second phase because it will require some changes to the bootstrap componenr and process.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624549 13f79535-47bb-0310-9956-ffa450edef68
2014-09-12 13:49:17 +00:00
Adrian Crum bf360c3d37 Fix FOP A4 page size.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1624538 13f79535-47bb-0310-9956-ffa450edef68
2014-09-12 13:18:13 +00:00
Jacopo Cappellato 9be3230d22 Removed unused jar.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623738 13f79535-47bb-0310-9956-ffa450edef68
2014-09-09 10:19:39 +00:00
Jacques Le Roux a61be3e0ff A patch from Shi Jinghai for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
I fixed the duplicated zh:
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh">分類頁面</value>
to
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh_TW">分類頁面</value>
in this patch.

Others are corrections on zh labels thank to Nick Ho's translation.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623359 13f79535-47bb-0310-9956-ffa450edef68
2014-09-08 11:13:00 +00:00