Commit Graph
10472 Commits
Author SHA1 Message Date
Jacopo Cappellato 189b8a4b34 A series of simplifications, cleanups of old code, and improvements to the code that setup the class paths for the OFBiz classloaders; the former code was setting the same jars (e.g. ofbiz.jar and all the base libs) in both the parent/child classloaders; it was unnecessarily setting the classpath system property when not required/useful.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623352 13f79535-47bb-0310-9956-ffa450edef68
2014-09-08 10:38:28 +00:00
Jacopo Cappellato 12303aa5a4 Removed the "rmi" loader from test startup configuration: it was loading the ComponentContainer two times.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623305 13f79535-47bb-0310-9956-ffa450edef68
2014-09-08 06:51:22 +00:00
Jacopo Cappellato 4483e59e1d removed unused old file in the catalina component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623268 13f79535-47bb-0310-9956-ffa450edef68
2014-09-08 04:51:55 +00:00
Jacopo Cappellato 4833915d0d Removed unused jars.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623042 13f79535-47bb-0310-9956-ffa450edef68
2014-09-07 15:04:31 +00:00
Jacopo Cappellato 3c76aa4b89 Removed unused jars.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623005 13f79535-47bb-0310-9956-ffa450edef68
2014-09-07 12:35:38 +00:00
Jacopo Cappellato c50eb3abfb Removed three asm jars not used by OFBiz code or any other jars in the OFBiz trunk.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622996 13f79535-47bb-0310-9956-ffa450edef68
2014-09-07 10:31:29 +00:00
Jacopo Cappellato 943b173f43 In my last commit I forgot to remove the Velocity jar.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622982 13f79535-47bb-0310-9956-ffa450edef68
2014-09-07 07:01:12 +00:00
Jacopo Cappellato c907d4dbe2 Removed old, not maintained and never really used integration with the Apache Velocity template engine.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622980 13f79535-47bb-0310-9956-ffa450edef68
2014-09-07 06:57:19 +00:00
Jacopo Cappellato 281209d0d1 Removed unused and not maintained integration with DataVision.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622979 13f79535-47bb-0310-9956-ffa450edef68
2014-09-07 06:43:41 +00:00
Jacopo Cappellato 75fe5a9107 Removed the old UtilJ2eeCompat util class that was probably created for compatibility with some old application servers.
UtilJ2eeCompat was used to figure out, by checking the servlet container implementation, if the response should be sent using a Writer or a OutputStream; a Writer was used for Tomcat, Websphere, Jetty, Orion, Jrun, Tradecity and an OutputStream was used for all the other servlet containers.

However accordingly to the Servlet api:

ServletResponse.getWriter():
         Returns a PrintWriter object that can send character text to the client.
ServletResponse.getOutputStream():
         Returns a ServletOutputStream suitable for writing binary data in the response.

Based on this getWriter() should always be used (for html pages) in all the containers, not just Tomcat, Websphere, Jetty, Orion, Jrun, Tradecity.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622976 13f79535-47bb-0310-9956-ffa450edef68
2014-09-07 06:32:25 +00:00
Jacques Le Roux 5451d2f255 Fixes <value xml:lang="zh_TW"> duplicates in CommonUiLabels.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622837 13f79535-47bb-0310-9956-ffa450edef68
2014-09-06 09:07:01 +00:00
Jacopo Cappellato 0136f12d3a Removed some obsolete properties set at startup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622468 13f79535-47bb-0310-9956-ffa450edef68
2014-09-04 12:40:15 +00:00
Jacopo Cappellato 0a5af77359 Moved the constructor at the top of the class, removed 2 static methods that were used to construct the object and embedded the logic in the constructor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622441 13f79535-47bb-0310-9956-ffa450edef68
2014-09-04 10:01:07 +00:00
Jacopo Cappellato 1c904a98d8 The Config class, that was used as an immutable object, is now effectively immutable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622427 13f79535-47bb-0310-9956-ffa450edef68
2014-09-04 09:05:32 +00:00
Jacopo Cappellato 8796e166d0 Removed unused field.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622412 13f79535-47bb-0310-9956-ffa450edef68
2014-09-04 07:44:41 +00:00
Jacopo Cappellato b324c22bcc Misc cleanups to remove dead code (that could never run or was not used), made a series of fields private and/or final, added some comments, formatting fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622409 13f79535-47bb-0310-9956-ffa450edef68
2014-09-04 06:47:31 +00:00
Jacopo Cappellato d4d1d92fff Conversion from FastList to ArrayList
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622407 13f79535-47bb-0310-9956-ffa450edef68
2014-09-04 06:25:05 +00:00
Adrian Crum c84824d1a7 A code cleanup/reorganization in the service engine.
The LocalDispatcher is supposed to represent the state of a single application, but that state was split between LocalDispatcher and DispatchContext. In addition, both classes shared a lot of fields.

This commit moves application state to LocalDispatcher and DispatchContext becomes a lightweight container for objects service implementations need to use.

In addition, some minor thread-safety issues were fixed.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622256 13f79535-47bb-0310-9956-ffa450edef68
2014-09-03 13:45:44 +00:00
Jacopo Cappellato 6f112e3ea7 Greatly simplified the UtilJ2eeCompat class by removing a series of variables and methods no more in use.
The class was not thread safe and this didn't cause particular issues probably just because all the threads using it were passing ServletContext with the same server info value (because they were associated to the same servlet container); it was however inefficient.
 Now it is thread safe using the DCL pattern which I usually tend to avoid but is useful here.
 However this class should probably go away but before taking a decision I will start a discussion in the dev list.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622193 13f79535-47bb-0310-9956-ffa450edef68
2014-09-03 09:10:04 +00:00
Jacopo Cappellato 47651f3e78 Unit test to confirm that running several queries within one transaction is faster than running them wrapped in individual transactions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622171 13f79535-47bb-0310-9956-ffa450edef68
2014-09-03 06:36:33 +00:00
Jacopo Cappellato 6c680d11e9 Improved formatting, comments and variable names.
A failed insert due to duplicated pk will generate an SQLException rather than returning 0 from executeStatement(), so changed the code to reflect this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622170 13f79535-47bb-0310-9956-ffa450edef68
2014-09-03 06:34:54 +00:00
Jacques Le Roux b74da066f1 Changes for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737 after an exchange between Shi Jinghai and Nick Ho. We really miss a Chinese committer :D
What I did (jleroux):
1. I used <value xml:lang="zh_TW">阿富汗尼</value>
2. I used <value xml:lang="zh_TW">內容管理系統站台</value>
3. I did not change
4. I did not change
5. I used <value xml:lang="zh_TW">此</value>, noticed that: <value xml:lang="zh"> </value>
6. I did not change
7. I used <value xml:lang="zh_TW">度量單位</value> (several places)
8. I did not change

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622124 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 21:04:14 +00:00
Jacopo Cappellato 1830aee2c7 Removed old code for JPublish
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622010 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 14:18:17 +00:00
Jacopo Cappellato 4f78f82b1d Removed the old and no more used custom JSP taglib.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621979 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 13:31:31 +00:00
Jacopo Cappellato 9d4de1ee06 Removed unused imports.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621977 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 13:15:26 +00:00
Jacopo Cappellato a129f3631f Moved support for JSP Regions to the Attic.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621971 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 12:48:49 +00:00
Jacopo Cappellato 30c092f2d2 Minor cleanups; no functional changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621953 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 09:38:50 +00:00
Jacopo Cappellato 0083faf85b Greatly cleaned-up and simplified the EventFactory and ViewFactory classes used by the RequestHandler: they are now (mostly) immutable and thread safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621942 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 07:26:03 +00:00
Jacopo Cappellato 2aab9001fc Removed some trivial padding for info messages at startup that required the usage of an external (freemarker) util class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621820 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 15:03:25 +00:00
Jacopo Cappellato e4e0710c18 Removed old and unused experimental class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621810 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 14:44:19 +00:00
Jacopo Cappellato 8e5c0eb4c1 A series of clean-ups and modifications to RequestHandler, EventFactory and View Factory to make then (mostly) immutable and eliminate some potential concurrency issues that could happen at initialization. This is just a first pass.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621804 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 14:26:54 +00:00
Jacopo Cappellato 6545122723 Removed unused/obsolete request/screen context fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621801 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 14:11:32 +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
Jacques Le Roux a8df43a739 Yikes, forgot to save this before r1621688 commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621695 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 07:23:18 +00:00
Jacques Le Roux 425ce1c003 A patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
more added/updated translations patch files for zh-TW locale

jleroux: 
I added the label
<value xml:lang="zh_TW">服務執行程式拋出一個異常</value>
by hand
Only 1 label was not added:
<value xml:lang="zh_TW">代號</value>
Because of the fuzziness and presence of several possibilities


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621688 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 06:51:33 +00:00
Jacopo Cappellato b20d598a67 Updated freemarker jar to the release candidate 01; waiting for the official release that should happen in mid October 2014.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621683 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 06:28:49 +00:00
Jacopo Cappellato bde211be6d Small optimization: two strings for sql statements are now stored as final strings in the SequenceBank object.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621599 13f79535-47bb-0310-9956-ffa450edef68
2014-08-31 15:41:52 +00:00
Adrian Crum 6c927d1112 Removed unnecessary public keywords from the LocalDispatcher interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621595 13f79535-47bb-0310-9956-ffa450edef68
2014-08-31 14:53:31 +00:00
Jacques Le Roux eb44087cd8 Upgrades Derby from derby-10.10.2.0.jar to derby-10.11.1.1.jar, tests OK (4 not relevant failures on Windows, we will get confirmation with Buildbot, or revert)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621581 13f79535-47bb-0310-9956-ffa450edef68
2014-08-31 10:18:38 +00:00
Adrian Crum fc272da011 Remove reference to DispatchContext from ModelServiceReader. The DispatchContext reference was only being used to get a Delegator reference, so we will use that instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621574 13f79535-47bb-0310-9956-ffa450edef68
2014-08-31 09:58:09 +00:00
Adrian Crum 1ac6edcab2 JavaDocs - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621571 13f79535-47bb-0310-9956-ffa450edef68
2014-08-31 09:08:36 +00:00
Adrian Crum 8f080966d3 Remove Javolution from DispatchContext.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621475 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 15:56:59 +00:00
Adrian Crum 8bcc227a48 Some work on ServiceDispatcher.java:
1. Remove Javolution.
2. Replace DCL design pattern with ConcurrentHashMap.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621466 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 14:47:53 +00:00
Adrian Crum fe096a298c Fixing some GenericDelegator method signatures to match the Delegator interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621460 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 13:38:24 +00:00
Adrian Crum 1f41988f38 GenericDispatcherFactory.java FIXME comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621454 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 13:01:39 +00:00
Adrian Crum f3e657b4d8 Move some GenericDelegator static methods to the Delegator interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621448 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 12:01:45 +00:00
Adrian Crum 0a76309879 Removed unnecessary public keywords from the Delegator interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621445 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 11:22:46 +00:00
Adrian Crum f14616dbdb Small code cleanup - use auto-boxing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621442 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 09:53:25 +00:00
Adrian Crum 4e38c83fbc Removed references to GenericDelegator from Delegator interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621439 13f79535-47bb-0310-9956-ffa450edef68
2014-08-30 09:19:38 +00:00
Jacopo Cappellato 892ed70e57 Completely refactored the SequenceUtil class:
* the class is now thread safe
* the class is now cleaner (no references to delegator etc...)
* replaced the collision detection algorithm with a simpler/reliable/efficient one based on: update with no changes (to get a lock) + select + update (to increase the last sequence id)
* removed ugly special code for "clusters" that is no more needed



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