Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux 5b71d410db Really better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1617498 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 14:53:43 +00:00
Jacques Le Roux bf902d9ff2 Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1617496 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 14:52:23 +00:00
Jacopo Cappellato 951b7ccb56 Fix for a typo and an important optimization: enabled cache lookup for the retrieval of SystemProperty records.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1617480 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 14:12:30 +00:00
Jacopo Cappellato fb20420e20 Some optimization for service event handler to prevent unnecessary operations at every service invocation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1617473 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 13:38:55 +00:00
Scott Gray e35bb8ec7e Replace FastMap with HashMap and remove imports
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616931 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 09:54:01 +00:00
Scott Gray ba907be142 Replace FastList with ArrayList
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616928 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 09:43:15 +00:00
Scott Gray 545851bebb Replace the ServiceXaWrapper with a simpler Synchronization implementation. Helps pave the way for use of alternative transaction management libraries that don't work well with our XA wrapper implementations. Still DebugXaResource to go.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616925 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 09:00:39 +00:00
Jacopo Cappellato 3583bfe285 Misc minor cleanups to log messages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616751 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 13:19:09 +00:00
Jacopo Cappellato 066d782950 Misc minor cleanups to log messages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616744 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 13:16:46 +00:00
Jacopo Cappellato 202ed2dee5 Some minor cleanups to the logs produced by catalina at startup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616741 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 13:08:44 +00:00
Jacopo Cappellato 5477810830 Fix for the wrong jar committed by Jacques in rev. 1615296; this one is actually from the Tomcat extras distribution, not from the standard distribution as the former was.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616684 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 07:49:45 +00:00
Jacopo Cappellato 2ccff3b51e Improved the way we start Tomcat embedded to remove a series of warnings at startup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616514 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 15:51:43 +00:00
Jacopo Cappellato 80e2f28c1c Removed some code that was checking, in a rather weak way, the Java version at startup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616492 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 14:17:41 +00:00
Jacopo Cappellato b399cbb143 Moved to Attic (https://cwiki.apache.org/confluence/display/OFBADMIN/OFBiz+Attic ) the incomplete, unmaintained and unused support for WFS. This code had also a series of issues: low level calls to Freemarker components that may change with newer versions of Freemarker, references to hotwaxmedia, wrong location for ftl files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616446 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 09:12:43 +00:00
Jacopo Cappellato 37d586c160 Converted some startup messages from "important" to "info".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616431 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:52:23 +00:00
Jacques Le Roux 59119195eb A patch from Leon for "Wrong timeFormat of datetimepicker causes hours represented as 12 not 24" https://issues.apache.org/jira/browse/OFBIZ-5702
Latest datetimepicker add-on uses "timeFormat" option to detect am/pm, lowercase "h" represents 12hr am/pm, uppercase "H" represents 24 hr. (see https://github.com/trentrichardson/jQuery-Timepicker-Addon/issues/547). The datetime input widget that relying on this add-on does not work correctly: it's in 12-hours format not 24 hours.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1616272 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 16:39:30 +00:00
Jacques Le Roux 6620856cac Update Tomcat from 7.0.54 to 7.0.55
No changes in framework\base\lib\j2eespecs


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1615296 13f79535-47bb-0310-9956-ffa450edef68
2014-08-02 11:18:26 +00:00
Jacopo Cappellato 4f4f95092c OFBIZ-4283: miscellaneous enhancements to give more control in the configuration of the DBCP connection pool. Thanks to Philippe Mouawad for the initial contribution that I have used as a starting point for a different implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1613431 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 13:19:59 +00:00
Jacopo Cappellato f66ab18d6e Upgrade to Commons DBCP 2; this new version is designed for Java 7 (JDBC 4.1).
Commons DBCP 2 relies on Commons Pool 2 and this commits upgrades that jar too.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1612909 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 18:26:33 +00:00
Adrian Crum e4ba71404a Fixed a bug in Mini-Language where a NPE could be thrown while using Verbose logging: https://issues.apache.org/jira/browse/OFBIZ-5689.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1612205 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 07:50:08 +00:00
Jacopo Cappellato 5455dc53d4 Fixed bug I introduced in rev. 1610918: thanks to Deepak Dixit for the bug report and resolution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1612190 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 05:56:45 +00:00
Jacques Le Roux fb62866eee Removes an useless @SuppressWarnings("deprecation")
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1612022 13f79535-47bb-0310-9956-ffa450edef68
2014-07-20 06:13:38 +00:00
Jacques Le Roux 77f16816da Check properties values
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1611311 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 10:09:35 +00:00
Jacques Le Roux f302a9a297 Format a bit more BJ's code
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1611246 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 04:51:37 +00:00
Jacques Le Roux 406f8ea616 No functional change: forgot to save this formatting just before committing r1611002
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1611200 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 21:38:48 +00:00
Jacques Le Roux 149ba3a471 An updated ands slightly modified patch from BJ Freeman for "allow assignment of port for the Javamail container." https://issues.apache.org/jira/browse/1967
currently no property for setting the port to read email from in the javamail container.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1611002 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 13:29:19 +00:00
Jacopo Cappellato c1e1671ab1 Add missing import from my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1610925 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 07:57:01 +00:00
Jacopo Cappellato 3b4e2b7ec5 Fixed miscellaneous errors spotted while reviewing the logs generated by the ArtifactInfo tool.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1610918 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 07:16:15 +00:00
Jacques Le Roux ac2c4a2955 XML escape changed (at least) CommonFollowingErrorsOccurred messages (seen in French). Those are safe to not be escaped
Also indentation of the escape

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1610425 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 15:12:13 +00:00
Jacopo Cappellato 85f8da63bb Removed useless, old and incomplete code: OFBIZ-4740 Un-necessary Drop Down in Web Tools Service Reference page
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1610420 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 14:51:52 +00:00
Jacopo Cappellato e439b5b6a6 This is a slightly modified version of the work contributed by Simone Viani in OFBIZ-5619: when a service model was cloned (e.g. when runSync/call-service are invoked passing the require-new-transaction flag) the service was executed with use-transaction set to true, even if the called service is defined to not use it. Also added some checks to make sure that if require-new-transaction is true then also use-transaction must be true.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1609155 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 13:56:39 +00:00
Jacopo Cappellato e2a23a25a8 Removed from "parseEntityXmlFile" the useless require-new-transaction="true" because in this service definition we have use-transaction="false"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1609149 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 13:51:04 +00:00
Jacopo Cappellato ef5976a228 Fixed Tomcat internal logging that was broken after the upgrade to the 7 series; log4j configuration for Tomcat is now inline with the one described in http://tomcat.apache.org/tomcat-7.0-doc/logging.html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1609047 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 07:53:23 +00:00
Jacopo Cappellato b7df4ce3ef Escaped for html all the messages (including error messages).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1608698 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 09:16:25 +00:00
Jacopo Cappellato 30736047df Removed useless logInfo statement that was causing the user password to be stored in the log files. Thanks to Grégory Draperi for the report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1608355 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 07:42:15 +00:00
Jacques Le Roux 8802023ece Fix a small bug where delegator was missing in a Groovy script
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1606660 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 09:59:06 +00:00
Jacopo Cappellato 3cfa3cff3e OFBIZ-5651: fixed broken settings for the appserver execution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605977 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 07:37:22 +00:00
Adam Heath ccb36f2238 Fix cobertura-report when source has been generated(aka, when javacc or
jjtree has been used).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605838 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 16:15:15 +00:00
Adam Heath e04a063f21 Fix line-ending differences between windows and unix in UtilIO parsing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605837 13f79535-47bb-0310-9956-ffa450edef68
2014-06-26 16:15:09 +00:00
Adrian Crum 714050ef33 Updated build files to use/require Java 7.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605524 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 17:59:46 +00:00
Vikas Mayur c14fc9c7ec Fix: When redirectAddress is specified and mail notification is disabled 'subject' can grow longer than the specified char limit in db and the service updateCommEventAfterEmail triggered on sendMail is failing for the same reason. The issue occurred when system invoke a failed job for the service sendCommEventAsEmail.
Note: sendCommEventAsEmail service also update the status of communication event by calling an inline service setCommEventComplete if there is no error in sendMail result. The service updateCommEventAfterEmail is also triggered by an eca on sendEmail which also do the same. They both eventually callthe service updateCommunicationEvent. In this case we should option (1) not call updateCommEventAfterEmail or option (2) make changes to updateCommunicationEvent so that it check for a status valid change before updating the communciation event record or option(3) just make updateCommEventAfterEmail responsible for updating the communication event record by removing the inline code that update the communication event to complete. Option (2) seemsright to me. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605286 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 08:02:51 +00:00
Adam Heath 8ea51fb77e Fix issues with inventory creation/transfer tests, and with the entity
engine tests, when run with java1.7.  Apparently, the order of methods
returned by reflection varies between runs, so if methods have implicit
requirements on each other, you get spurious errors.

The are 3 types of fixes:

* Combine the separate testCase methods into one
* Add explict method ordering.
* Make use testCase method completely stand-alone.

The product inventory tests were combined, while the entity engine tests
were restructured to be stand-alone.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605269 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 05:27:30 +00:00
Adam Heath 83b70a5643 Fix reversion introduced in StringUtil in r1330955; string maps using
"|" were being parsed correctly.  This fixes OFBIZ-5667.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605268 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 05:27:22 +00:00
Adam Heath 455edd3727 Remove sourcepathref from default-javac; in build.xml that did *not*
create a src-dir patternset, the default *empty* src-dir pattern set was
used.  Then, when javac would compile src/**/*.jar, it would *also*
compile any *other* java files it happened to find in the folder.

In other words, if there was an unpacked tree, let's say named 'p', and
there was a set of folders in there that eventually had java files, they
would all get compiled.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605223 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 23:21:05 +00:00
Adam Heath 6690816b01 Fix detection of cobertura, for compilation of the hook used by the
runtime container; also fixes the classpath used to define the ant
task.  Now, command-line api tests run underneath cobertura work.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605216 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 23:07:39 +00:00
Adam Heath c44853b234 Remove the empty dir, which then re-broke compilation of testtools.
This reverts all of the recent built-system breakage.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605213 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 22:51:31 +00:00
Adam Heath da7504cc2e Revert "Move ant out of the primary classpath; the shell script and batch file"
This reverts commit 24d7bda48e9618691b28cf63ef02354e1c2df2c8.

Conflicts:

	LICENSE

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605179 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 20:30:39 +00:00
Adrian Crum b934663b22 Fix broken build.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605160 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 19:16:18 +00:00
Adam Heath 55a4cc3023 Remove ant-nodeps, it's no longer part of 1.9.0 apparently.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605121 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 16:01:29 +00:00
Adam Heath 702ac6d2f8 Move ant out of the primary classpath; the shell script and batch file
now load it from this out-of-band location.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1605119 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 16:01:13 +00:00