Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux d9e079b8e8 To end gracefully the files generation process we must remove System.exit(1) here.
Inspired by a patch from Sankp for "Incorrect argument processing while Generating container" https://issues.apache.org/jira/browse/OFBIZ-4929 at r1355974 in R11.04

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355975 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 18:30:20 +00:00
Jacopo Cappellato b835d4f17d Forgot to commit these mods; they should have been part of rev. 1355854
Thanks to Adrian Crum for the report (build was failing)




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355923 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 15:07:21 +00:00
Jacopo Cappellato ea54b4ff18 Added new getName method to the Container interface and to all the implementations; added info messages to inform when containers are started/stopped.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355854 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 07:32:07 +00:00
Jacopo Cappellato b3a310b3df Moved catalina container definitions to the catalina component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355853 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 06:59:37 +00:00
Jacques Le Roux 8266a36101 "Login out on a cluster handled by DeltaManager causes a NPE" https://issues.apache.org/jira/browse/OFBIZ-4289
Uses a HashMap instead of a FastMap here because else we get this kind of error when OFBiz is shut down:

2012-06-12 10:35:29,921 (OFBiz_Shutdown_Hook) [ StandardSession.java:1567:WARN ] Cannot serialize session attribute LAST_VIEW_PARAMS for session 00C48D0D76821C98403482FAE8B77C24.jvm1
java.io.NotSerializableException: net.sf.json.JSONObject
at java.io.ObjectOutputStream.writeObject0(ObjectOutputStream.java:1164)
at java.io.ObjectOutputStream.writeObject(ObjectOutputStream.java:330)
at javolution.util.FastMap.writeObject(FastMap.java:1513)

Note: to test the above you need to set apps-distributable to true and put some <distributable/> in the web.xml files of the applications to test



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355660 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 08:15:42 +00:00
Jacopo Cappellato c386b7fc9a Added new "name" argument to the "init" method of the Component interface: now the name of the container (set by the xml attribute container.name) is passed to the init method and it is used to retrieve the container's configuration; before of this the container's name was hardcoded preventing the ability to define (and load) two containers (with different settings) of the same type.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355652 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 06:32:00 +00:00
Jacopo Cappellato f9cc630e33 Misc cleanups to the specialized *-containers.xml files: removed redundant commented out definitions (that are copy of the ones available in ofbiz-containers.xml) and removed a couple of still enabled beanshell telnet containers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355470 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 16:55:11 +00:00
Jacopo Cappellato 068430fb8b Moved a few container definitions from the base/config/*-containers.xml files to their own component's ofbiz-component.xml file; this is a demonstration of the usage of the new ability to define component level containers; this is still experimental and there is room for improvements (and I am working on them and going to discuss a few details in the dev list) but this should already give a good idea of how we can remove redundancy from the various *-containers.xml files, remove dependencies between framework components and make the components self deployable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355466 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 16:43:51 +00:00
Jacopo Cappellato 7b65f2dfbc Added ability to define "loaders" for loading selectively specific containers defined in components.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355460 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 16:33:22 +00:00
Adrian Crum 4112e1e880 Mini-language <find-by-and> element improvement: add a fields-to-select-list attribute.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355348 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 12:56:33 +00:00
Adrian Crum 5d4c21feea Minor change to Mini-language <find-by-primary-key> element - prevent unnecessary copying of field name set.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355347 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 12:54:42 +00:00
Sascha Rodekamp d9de95aec9 Render checkbox field as same behavior as radiobox (https://issues.apache.org/jira/browse/OFBIZ-4948): A patch from Leon: when rendering a radio field in form widget, the generated html codes looks like: <span><input type="radio" ...>blahblah</span>. The radio box and its description are wrapped by <span> and it's easy to change css style for both of them (radio and description), not only for radio type input. But the check box is rendered in another way without <span> around.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1355291 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 09:31:22 +00:00
Jacopo Cappellato 3594858b4f This (temporarily) reverts my last commit 1354885: I still have to figure out a few things (how to selectively enable/disable containers at startup)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1354905 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 10:35:33 +00:00
Jacopo Cappellato d5c7ad614e Moved the "container" declaration for Birt from the base/config/ofbiz-containers.xml to the Birt's own component definition file: this change is a step in the direction of making the "birt" component self deployable (in the hot-deploy folder), in preparation for the removal of the "birt" component from the trunk.
This configuration is made possible by the commit rev. 1354884 and we may consider to apply it to other containers (e.g. Jetty and Catalina).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1354885 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 09:43:18 +00:00
Jacopo Cappellato 50c2e0e089 It is now possible for a component to define new "containers" that are loaded after the ones defined in base/conf/*-containers.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1354884 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 09:31:37 +00:00
Christian Geisert 5f4d64dcfa German translations
See OFBIZ-4906 (https://issues.apache.org/jira/browse/OFBIZ-4906)
Submitted by Martin Kaiser (martin dot kaiser at gmail dot com)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1354852 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 08:19:28 +00:00
Jacopo Cappellato 6ba24ed4bc As discussed in the dev list a few months ago, this commits removes Seleniumxml from the trunk.
Seleniumxml was a subcomponent of the framework/testtools intended to facilitate the usage of Selenium tests in OFBiz.
However it was never upgraded to the new version of Selenium and it has not been widely adopted by the community; the OFBiz community agreed to remove components/tools like this from the core distribution if they are optional/very specific or not well maintained or if there is (as in the case of Selenium) a valid external alternative to perform the same actions.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1354380 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 09:19:20 +00:00
Jacopo Cappellato 259bc681d6 Added new field "Current Retry Count" and logic to keep track of failed job executions; before this enhancement the check against maxRetry was done querying failed records and the approach had performance issues and could be unreliable because failed records can be purged. However the old mechanism is still used when the new field is not set for backward compatibility.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1354041 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 14:52:06 +00:00
Jacopo Cappellato bdf7a4702c Enhancement for JobSandbox: the job execution result message (success/error/exception messages) is now stored in the new field JobSandbox.jobResult
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353905 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 09:53:07 +00:00
Jacopo Cappellato fc099856c1 Small enhancements to the job search form (drop down maintains last selected value for all fields) and to the schedule job form (max retry is set to 0 by default to avoid to run forever on error by default).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353898 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 09:46:58 +00:00
Jacopo Cappellato cecbe18a5c Reverting a local unwanted change that I committed in rev. 1353686; thanks to Jacques for the review.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353736 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 20:49:01 +00:00
Jacopo Cappellato d7d999966c Fixed a few wrong attribute names: authorization --> authz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353686 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 18:00:01 +00:00
Jacopo Cappellato 3756ed0294 Cleaned up some code that was adding the delegator/dispatcher/security/auth objects in the user session rather than the request;
1) removed the request-maps for changeDelegator from components' controller.xml files: they were not used
2) removed CoreEvents.changeDelegator(...): not used (apart from the request-maps removed at #1)
3) removed CoreEvents.changeDispatcher(...): not used
4) cleaned up some code (related to multitenant development): now the objects are set in the request rather than the session

PS: as a consequence this will also fix the issue reported in OFBIZ-4289


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353681 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 17:46:07 +00:00
Sascha Rodekamp 4a3e412922 Fix IE7 Bug in javaScript files, restructuring lookup -> modifySubmitButton function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353482 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 11:58:10 +00:00
Sascha Rodekamp 55e612c8be Fix a small bug with the lookupDescription: An exception was thrown when a wrong parameter string was passed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353422 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 08:12:17 +00:00
Hans Bakker 26be6e9d7c Give ACCOUNTING_ADMIN the same access as PAY_INFO_ADMIN because part of accounting component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353381 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 02:22:58 +00:00
Adrian Crum 00644c541e Improved Mini-language <script> element - allow execution of inline scripts in addition to external scripts, matching the <call-bsh> behavior.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353284 13f79535-47bb-0310-9956-ffa450edef68
2012-06-24 15:25:30 +00:00
Jacques Le Roux 2cf0faf52c Closes "Login out on a cluster handled by DeltaManager causes a NPE" https://issues.apache.org/jira/browse/OFBIZ-4289
Removes all changes related to this issue. We will see later if ever it proves to be a real issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353135 13f79535-47bb-0310-9956-ffa450edef68
2012-06-23 14:57:18 +00:00
Jacopo Cappellato 15fe323128 Removed some junk and unused code left over after the commit:
Author: jleroux
Date: Fri Jun  3 19:05:07 2011
New Revision: 1131144

was "reverted" as part of:
 
 Author: jleroux
 Date: Fri Sep 23 19:22:40 2011
 New Revision: 1174964
 
 The code is still broken.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1353094 13f79535-47bb-0310-9956-ffa450edef68
2012-06-23 08:33:01 +00:00
Sascha Rodekamp 2297052c0c Refactoring fieldlookup.js - step one.one: moving some methods
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352861 13f79535-47bb-0310-9956-ffa450edef68
2012-06-22 12:17:20 +00:00
Sascha Rodekamp 38abbfc4c2 Refactoring fieldlookup.js - step one: restructuring the lookup object, encapsulate some methods in objects
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352804 13f79535-47bb-0310-9956-ffa450edef68
2012-06-22 08:48:58 +00:00
Jacopo Cappellato db5be508a8 Removed unnecessary synchronized blocks; made UtilCache objects private and final.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352592 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 16:12:59 +00:00
Jacopo Cappellato 6684c46b74 Improved memory usage information in the webtools->cache screen: the approx size in bytes is now shown for each cache in the list and the total memeory used by caches is also reported at the top of the screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352578 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 15:46:49 +00:00
Jacopo Cappellato 665e81597a Improved information logged when the method is unable to compute the approximate byte size of a cached object using serialization: instead of a useless stack trace it is returned an informative message with the name of the class that is not serializable; in case of null objects a message is also logged.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352575 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 15:42:45 +00:00
Jacopo Cappellato 5cb3561232 Fixed bug discovered while analyzing content of caches (found null objects instead of parsed scripts).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352539 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 14:14:21 +00:00
Hans Bakker 7e5c9958a5 manual payment is used: reverting r1352439
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352441 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 08:03:11 +00:00
Hans Bakker 66d5f75d5e removed unused security permission: MANUAL_PAYMENT
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352439 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:52:23 +00:00
Hans Bakker bd16dfb598 split up securitypermissions as seed data and securitygroups as demo data with a single exception: the creation of a super security group which has general access to the system and which is used with the 'ant create-admin-user-login' command.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352431 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:21:49 +00:00
Jacopo Cappellato 99d58d0330 Implemented screen that shows details about JobSandbox records, including their input data (RuntimeData.runtimeInfo deserialized) if available.
)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352171 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 15:53:39 +00:00
Jacopo Cappellato a9a1bc5f24 When an IOException error happens while communicating with the browser (for example when the user closes the browser window before the page is returned) there is no need to attempt to render the error page; this was causing two error stack traces in the logs every time a connection was aborted; improved logging for this event.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 09:00:26 +00:00
Jacopo Cappellato 3688639a2d Fixed typo in comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351955 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 07:03:21 +00:00
Hans Bakker 26eb43592b re-installed locale lookup with an appropriate fix: adding the locale search
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351928 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 03:17:59 +00:00
Jacopo Cappellato 3c0b58d8e6 Setting a default value of DeltaManager was causing a side effect: the method setWebContextObjects was always invoked with the persistSerialized argument set to false; this was causing a series of issues (including one reported recently happening when two users login/logout to the same application from the same browser and visit another application).
The commit when this bug was introduced is:
 
 Author: jleroux
 Date: Mon Jun  6 20:26:35 2011
 New Revision: 1132749
 
 and unfortunately the revision was backported to the release branches; the commit may have introduced other issues but I can't review it now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351778 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 17:14:14 +00:00
Jacopo Cappellato 0faee1b07e Trivial change to make to avoid to perform a series of useless method calls when the security object is not in the context.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351777 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 16:53:03 +00:00
Jacopo Cappellato f3da3c9e6a Upgrade of Tomcat from 7.0.27 to 7.0.28; also renamed the jars containing j2ee specification apis: there was no need to append the tomcat version because they don't change in all the 7.0 releases; instead I have added a suffix to better expose the specification version.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351734 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 14:57:25 +00:00
Sascha Rodekamp 16c1fd47d9 Upgrade the datetime picker to version 1.0 and remove the old libraries
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351638 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 10:11:59 +00:00
Sascha Rodekamp 56c2c6123a Reverting the local lookups which where introduced in Rev 1124153.
The locales are not searchable because they come from a property file and not from the database. It's more handy to have a drop down list instead of a lookup for them.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351614 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 09:13:09 +00:00
Sascha Rodekamp 98a21f4afe Upgrade jQuery lib to 1.7.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351605 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 08:49:53 +00:00
Hans Bakker 9607b08c5c Removed unused SHIPRATE_* security
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351587 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 07:07:01 +00:00
Hans Bakker 5ea30aab8f tenant data in the entity component is meant for demo, so demo data. comment from Adam
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351213 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 06:40:31 +00:00