Commit Graph
3778 Commits
Author SHA1 Message Date
Si Chen c396b92ff4 Fix some potential NPEs from Oleg Andreyev OFBIZ-1244
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@578874 13f79535-47bb-0310-9956-ffa450edef68
2007-09-24 16:39:40 +00:00
David E. Jones dd9811fd17 Small tweak so that it doesn't blow up when doing the all entity thing with a fromDate; unfortunately the all entities thing no longer checks for view entities and not auto-checking those boxes, which is lame and I wish whoever removed it hadn't, but oh well
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@578752 13f79535-47bb-0310-9956-ffa450edef68
2007-09-24 10:53:04 +00:00
Andrew Zeneski b330fea32e fixed bug where runtime data was not being deleted
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@578274 13f79535-47bb-0310-9956-ffa450edef68
2007-09-21 21:03:19 +00:00
Andrew Zeneski ebfbea1b9a uses nested trys
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@578273 13f79535-47bb-0310-9956-ffa450edef68
2007-09-21 21:03:03 +00:00
Alfred Maxwell Byers f751ac43e1 Tuning the method so that it gives passed dataResourceId priority over passed contentId, but not
over content.dataResourceId.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@578181 13f79535-47bb-0310-9956-ffa450edef68
2007-09-21 15:49:07 +00:00
David E. Jones 1c746f7234 Chagned type for very-long in MySQL from TEXT to LONGTEXT to be more similar to what we expect in other databases; TEST has a max size of 64KB, LONGTEXT has a max size of 4GB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@577960 13f79535-47bb-0310-9956-ffa450edef68
2007-09-21 02:04:29 +00:00
Alfred Maxwell Byers e0d985e8cc The content widget was not using the dataResourceId attribute. To make it work I had to
copy someone's brilliant WidgetContentWorker pattern.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@577932 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 21:30:44 +00:00
Jacques Le Roux fdf6348bf9 Transparency added
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@577740 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 13:35:58 +00:00
Alfred Maxwell Byers c7c2045158 Just implementing Adam's request.
Line 51 now looks like:
                   if (this.alias.equals(aliases[x])) {



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@577544 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 04:44:23 +00:00
Andrew Zeneski 1ef6a9f731 changed where semaphores are released (in finally block to make sure it is run even in the case of an exception) implemented per-service configurable settings for wait/sleep (sleep in milliseconds; wait in seconds) semaphore-wait-seconds="300" (default) is 5 minutes. The max time a service will wait before failing to run.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@577141 13f79535-47bb-0310-9956-ffa450edef68
2007-09-19 04:04:08 +00:00
David E. Jones f63513b53f Refactored to use a loop instead of recursion for the retries so the stack doesn't get so huge; also added notes about some things that need to be done on this semaphore stuff
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@577139 13f79535-47bb-0310-9956-ffa450edef68
2007-09-19 03:06:55 +00:00
Andrew Zeneski b1478118c4 changed so the purgeOldJobs service can only run one at a time to prevent locking on the job sandbox table; when it is running on multiple application servers at the same time
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@577097 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 22:56:19 +00:00
David E. Jones 4c02885546 Added global-commit-post-run event that gets a context after the service and eca rules run
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576815 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 10:04:50 +00:00
David E. Jones 8da94ddff4 Changed to use FlexibleLocation so that for url resource loaders in component config files you can use the component:// style url for resources in components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576796 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 09:24:19 +00:00
Scott Gray a1b604adf6 Changed all occurances of new BigDecimal("0") to BigDecimal.ZERO and likewise for BigDecimal.ONE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576773 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 08:30:58 +00:00
Alfred Maxwell Byers eb03dea061 RenderTemplate was not working for .ftl files that are used as templates in CMS.
The "templateLocation" value in those cases is something like "DATARESOURCE:<id>"
and that causes makeReader(...) to fail.

renderTemplateFromString(...) still checks to see if a cached template exists, but
if it doesn't and since it has the template string, it builds the template from the
"templateString" and puts it in cashe.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576766 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 08:07:29 +00:00
Alfred Maxwell Byers 48b92accf0 Added FreeMarkerWorker.getSiteParameters to render method.
This data, particularly "rootDir", is used loading FTL content templates.
I figured it could not hurt normal screen rendering.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576757 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 07:49:16 +00:00
David E. Jones 1aeaa42a42 Added test of global-commit and global-rollback, also commented out the failing tests so that these will all succeed, as solutions are found for these other tests they should be added back in, those are the lock wait timeout tests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576730 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 06:46:04 +00:00
Andrew Zeneski d327438d57 implemented junit xml formatted output to test cases; new options -results=filename default file outputs to runtime/logs/test-junit.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576686 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 04:27:14 +00:00
Andrew Zeneski c239535138 changed log level to stop annoying error when running test cases
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576678 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 03:53:12 +00:00
David E. Jones a1a4271304 A small change to make it possible to attach these to a transaction other than the currently active one (like a paused one, for example)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576661 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 02:09:52 +00:00
David E. Jones 559723ad32 Changed to use BigDecimal.valueOf instead of constructor, for something closer to the expected results; thanks to Jacopo and Martin Anderson for comments on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576660 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 02:09:09 +00:00
Scott Gray c501041f58 Applied patch from myself based on comments from David E Jones in an issue reported by Pham Hoai Van OFBIZ-152, Removed the boolean keepLocalReaders and any references to it since the false setting is no longer supported.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576331 13f79535-47bb-0310-9956-ffa450edef68
2007-09-17 09:47:50 +00:00
Scott Gray c2218ce5bd Applied patch from Vinay Agarwal OFBIZ-102, "cross-redirect" wasn't being stripped from the url.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576328 13f79535-47bb-0310-9956-ffa450edef68
2007-09-17 09:34:06 +00:00
Scott Gray 05432d31b3 typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@576324 13f79535-47bb-0310-9956-ffa450edef68
2007-09-17 09:23:32 +00:00
David E. Jones ad308bf854 Small validation improvement
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575853 13f79535-47bb-0310-9956-ffa450edef68
2007-09-15 02:07:03 +00:00
Jacopo Cappellato fc8336c7a7 Updated log4j jar to latest release: this fixes the annoying NPE at startup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575675 13f79535-47bb-0310-9956-ffa450edef68
2007-09-14 13:37:24 +00:00
David E. Jones 19ab65004c Small improvement and quieting of log message
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575446 13f79535-47bb-0310-9956-ffa450edef68
2007-09-13 20:49:44 +00:00
Andrew Zeneski 4202c6ecac refactored entity engine factory and transaction factories to allow full configuration of managed connections through entityengine.xml. changed all connection factories to be instance objects (singleton pattern) implementing the new ConnectionFactoryInterface interface.
Two working connection factories are included now, Minerva and DBCP. 

Minerva is still default until more testing can be done on DBCP; to change this use the DBCPConnectionFactory instead of MinervaConnection factory (see entityengine.xml)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575396 13f79535-47bb-0310-9956-ffa450edef68
2007-09-13 18:32:31 +00:00
David E. Jones 4c56bd82d9 Fixed a couple of issues with the tx tests, for deadlock the problem was with the test, also changed to hide error with the rollback only set and attempt to commit so doesn't show up as error or failure in test case
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575366 13f79535-47bb-0310-9956-ffa450edef68
2007-09-13 16:47:36 +00:00
Andrew Zeneski b9fe2735e4 added DBCP connection pool and supporting class; need to modify ConnectionFactory to enable this; needs more testing before 'production' ready (snapshot of 1.3 DBCP)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575181 13f79535-47bb-0310-9956-ffa450edef68
2007-09-13 06:10:34 +00:00
Andrew Zeneski d4c785dad4 implemented ServiceSemaphore; built in locking to prevent services (when defined) from running at the same time; uses database record to work with a cluser of application servers. Three modes are available:
None - Does no locking
Wait - Waits for the previous service to complete (currently up to 5 minutes)
Fail - Fails when the same service is already running

use the semaphore="none|wait|fail" in the service definition (none is the default when the attribute is not defined)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575074 13f79535-47bb-0310-9956-ffa450edef68
2007-09-12 20:58:44 +00:00
Andrew Zeneski 429b9ade8e turned off logging from testing the server hit/visit bypass functionality; added code to send back errors to the stream handler
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@575065 13f79535-47bb-0310-9956-ffa450edef68
2007-09-12 20:31:44 +00:00
David E. Jones 38d3888005 Changed a couple of log messages to be info instead of always
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574837 13f79535-47bb-0310-9956-ffa450edef68
2007-09-12 08:24:12 +00:00
David E. Jones d35f4480a7 Changed service defs to refer to simple-method files by component:// urls instead of classpath resource locations; now that this is in removed the script directory from the classpath; this is the first step in doing this across the project to be less classpath dependent
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574829 13f79535-47bb-0310-9956-ffa450edef68
2007-09-12 08:03:11 +00:00
Andrew Zeneski f59b6db4a4 adjusted to reflect change (track-serverhit)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574716 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 22:49:16 +00:00
Andrew Zeneski 01aeb00f2f changed track-stats to track-serverhit to be more clear
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574715 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 22:48:55 +00:00
Andrew Zeneski 6ca57eb79d turned off visit and hit tracking for xmlrpc calls
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574710 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 22:10:46 +00:00
Andrew Zeneski 2e8645ed67 added code to disable ServiceHit and Visit tracking for defined requests (use new track-stats and track-visit attributes on the request URI); also supports disabling tracking per webapp (use init param track-stats and track-visit)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574709 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 22:09:40 +00:00
Andrew Zeneski 2d1b5b3083 fixed small bug prevent small files from being uploaded
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574698 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 21:24:29 +00:00
David E. Jones 882124675e Fixed problem with service engine and TransactionUtil where if rollback only was set in a service it could not run sub-services even in their own transaction; the test case for this now passes with no problems
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574514 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 08:52:18 +00:00
David E. Jones 84580f87fb Added service to test case that is currently not working where a service with a transaction with rollback only set can't call a service in its own transaction
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574493 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 07:15:30 +00:00
Andrew Zeneski 2b36eb82b6 upgraded javolution
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574482 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 06:24:52 +00:00
David E. Jones a21616fbca Added mode to error message... it's REALLY annoying to not know in/out for parameter validation errors
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574451 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 05:06:28 +00:00
David E. Jones c9ac857f36 Applied little patch from Ray Barlow to correct unencoded ampersand; Jira #OFBIZ-1174
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574442 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 03:34:31 +00:00
Jacques Le Roux 99018818b3 A patch from Bilgin Ibryam "Added a few missing UiLabels to order component" (https://issues.apache.org/jira/browse/OFBIZ-1225) with some more changes from my own
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@574072 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 20:40:43 +00:00
Jacques Le Roux c1d5cbf664 Finally put toUpperCase in ModelFieldType.StringLength() on David's advice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573980 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 10:25:13 +00:00
David E. Jones 20d6259e82 Added some tougher variations on the deadlock retry test case to make sure both threads succeed in the end; note that this appears to be failure for the non-retry thread so the retry code and/or the test cases need a little more work
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573973 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 09:39:13 +00:00
Jacques Le Roux b45c9b49a9 A patch from Adrian Crum "ModelFieldType.StringLength() returns incorrect value" (https://issues.apache.org/jira/browse/OFBIZ-1229)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573967 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 09:16:50 +00:00
David E. Jones 3249854cee A few refinements to the deadlock retry test case, but the main part of this is the actual implementation of the deadlock retry in the service engine, and the implementation of that makes the deadlock test case pass now; this is a bit of rework in some low level code so this needs some good testing beyond the few general tests already done
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@573956 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 08:13:25 +00:00