Commit Graph
2421 Commits
Author SHA1 Message Date
Adam Heath 1625a1a80f FIX/FEATURE: When shutting down, make certain to close down log4j as
well.  This will ensure that any asynchronous logs have finished
writing to disk, or to the console.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1482000 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 18:01:47 +00:00
Jacques Le Roux 0638e8fa03 A sligthly modified patch from Christoph Neuroth for "Exceptions logged when caches contain collections with unserializable objects" https://issues.apache.org/jira/browse/OFBIZ-5184
jacopoc commited revision 1352575 which would prevent stack traces to be logged when viewing the cache overview screen in /webtools. However, a stacktrace is still logged when the caches contain collections which themselves contain objects which cannot be serialized.

jleroux: I simply used logWarning instead of info

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1480079 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 21:09:47 +00:00
Adrian Crum 73f64676df Added an Observable class and Observer interface. These will be used in an improved GenericEntity implementation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1470389 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 05:37:31 +00:00
Jacques Le Roux 67f1143c65 Fixes "Bug in properties management." https://issues.apache.org/jira/browse/OFBIZ-5159
Yesterday, I faced a weird bug in properties management.
For a reason, a copy of a project slipped in the project itself (like if you had a copy of ofbiz root in ofbiz root).
And in this project a properties file (in a hotdeploy component) as the same name than the project (like ofbiz.properties)
Then, as properties for this file, I got all the content of the sub-dir (here would be the files in ofbiz/ofbiz) instead of the properties

This fixes it, no performance issues since properties are cached so properties file are only accessed once

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1470176 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 15:29:45 +00:00
Jacques Le Roux 36872419e7 billhuang noticed at https://issues.apache.org/jira/browse/OFBIZ-5172 that "description is incorrect":
int org.ofbiz.base.util.UtilValidate.java file:
    public static final String isMinuteMsg = "The Hour must be a number between 0 and 59.";
    public static final String isSecondMsg = "The Hour must be a number between 0 and 59.";
should be 
    public static final String isMinuteMsg = "The Minute must be a number between 0 and 59.";
    public static final String isSecondMsg = "The Second must be a number between 0 and 59.";


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465351 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 09:35:26 +00:00
Jacopo Cappellato 6a72085f8b Updated commons logging to the latest bug fix release 1.1.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465345 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 08:41:21 +00:00
Jacopo Cappellato 42e11fe17d Replaced Commons Beanutils jar with the "core" (slightly lighter) version that doesn't contain Beanutils Collections classes that shouldn't be required by OFBiz.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465334 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 07:29:29 +00:00
Jacopo Cappellato 3cad56e33b Moved Jetty component from framework to specialpurpose
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465283 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 18:04:11 +00:00
Jacopo Cappellato c04409e2eb Removed two jar files that contain classes already available in other jars:
* el-api-2.2.jar is a duplicate of juel-2.2.1.jar
* geronimo-qname_1.1_spec-1.0.jar is a duplicate of xml-apis-2.9.1.ja



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465281 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 17:47:02 +00:00
Jacopo Cappellato 62d02aaea9 Removed the GroovyShellContainer, that was disabled by default for security reasons, mostly because it was based on some code distributed with unclear license terms.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465254 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 14:48:10 +00:00
Adrian Crum 8b122612cd Removed Javolution from UtilMisc.java. Also removed the SimpleMap class - which provided no benefit because it was converted to a "real Map" 99.8% of the time.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465253 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 14:44:34 +00:00
Adrian Crum ecae60f467 Small optimization for location resolvers - don't go to the file system while building URLs. This will benefit single box (app server + DB server) installations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464750 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 20:57:46 +00:00
Adrian Crum 25928aba2a Small fixup for CachedClassLoader.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464744 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 20:53:21 +00:00
Adrian Crum 01fcde7134 Some optimizations in FlexibleMapAccessor.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464032 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 14:10:01 +00:00
Adrian Crum 48c26a3216 CachedClassLoader.java - replaced Javolution with non-blocking java.util.concurrent.* classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1464015 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 13:54:10 +00:00
Jacopo Cappellato e66239876f Small improvements to error log messages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1463885 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 08:56:31 +00:00
Adrian Crum 19e3b14945 Fixed bug in BaseUnitTests.java where the original debugging levels were not restored.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1463856 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 07:53:11 +00:00
Adrian Crum 909bed712c Some optimization work in UtilURL.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1462942 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 13:12:20 +00:00
Jacopo Cappellato c1ae34b45d Upgrade from Ant 1.8.4 to Ant 1.9.0: in the process I have also switched the naming convention of jars to the new one we are adopting for example for Tomcat jars that is <NAME-OF-THE-EXTERNAL-PROJECT>-<RELEASE-NUMBER>-<ORIGINAL-NAME-OF-JAR-FILE>.
For example, in in the release package apache-ant-1.9.0.zip we have the jar ant-launcher.jar, the name of the jar in OFBiz is: ant-1.9.0-ant-launcher.jar



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1461709 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 17:01:12 +00:00
Jacopo Cappellato 88005f87ab Upgrade from Log4j 1.2.16 to Log4j 1.2.17
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1461681 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 16:03:32 +00:00
Jacques Le Roux 54dfb7ea95 A patch from Martin Kreidenweis "Delegator creation fails with new ExecutionPool on trunk" https://issues.apache.org/jira/browse/OFBIZ-4335
The problem is that the wrong class loader is used for the "ofbiz-config-*" threads (NativeLibClassLoader instead of CachedClassLoader). This happens when the threads are created by the static code in ExecutionPool.java when it is executed before the ClassLoaderContainer.init() initializes the CachedClassLoader.

This also causes other problems like: The local resolution of XML Schema files won't work any more because it's also using the wrong classloader, which can't find the XSD files:

[java] 2011-07-21 12:21:45,333 (ofbiz-config-0) [                 UtilXml:1022:WARN ] [UtilXml.LocalResolver.resolveEntity] could not find LOCAL DTD/Schema with publicId [null] and the file/resource is [service-eca.xsd]

You can trigger this behavior in current ofbiz trunk by setting an expire time for the properties cache in cache.properties

properties.UtilPropertiesResourceCache.expireTime=10000

The Debug.log() statements in the ContainerLoader then load the logging configuration properties file and cache it. If an expire time is set, the ExecutionPool is used and creates the "ofbiz-config-*" threads too early.

By not pre-starting the "ofbiz-config-*" threads in the static code (patch above), the threads are then created later on, when the "main" thread classloader has become the CachedClassLoader and everythings starts working again. 

jleroux: 
* I don't see any issues, but performance, to not start the whole core threads. This is BTW the default behaviour. So I'd recommend to use it for GLOBAL_EXECUTOR.
* I also removed the useless deprecated methods

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1435701 13f79535-47bb-0310-9956-ffa450edef68
2013-01-19 21:05:23 +00:00
Jacques Le Roux f62933059d No functional changes
I tried to use the non useLog4J branch and localised it to show more like how useLog4J renders. But I found some issues with (time was not in sync useLog4J when I used both) and finally did not use it. So it's only the l10n part
I also added a convenient get()

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1426606 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 18:47:02 +00:00
Scott Gray 04df9cb162 Add a bunch of missing Override annotations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418651 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:06:40 +00:00
Scott Gray 0af4184d61 Remove a bunch of unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418650 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:06:01 +00:00
Scott Gray 5df3e3f70b Remove a bunch of unused imports, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418646 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:03:52 +00:00
Jacopo Cappellato f6244c689f Trivial fixes for some typos in Java comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1416451 13f79535-47bb-0310-9956-ffa450edef68
2012-12-03 11:15:44 +00:00
Jacques Le Roux e6ede1ca2e Reverts r1310983 (related to https://issues.apache.org/jira/browse/OFBIZ-4792 )for 2 reasons:
* I missed to put in LICENSE and NOTICE
* It's an issue for Birt, see OFBIZ-5070


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1416358 13f79535-47bb-0310-9956-ffa450edef68
2012-12-03 07:02:38 +00:00
Jacques Le Roux b46c7a2c06 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Got an issue merging GeoData_JP.xml with Subclipse, using Toirtoise solved it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Jacques Le Roux ee091b11d5 A Christoph Neuroth's idea "Include complete stack trace in groovy script exception messages" https://issues.apache.org/jira/browse/OFBIZ-5049
When a groovy script fails, currently you can only follow the stack trace to rg.ofbiz.base.util.ScriptUtil.executeScript(ScriptUtil.java:348), but not into the failed script itself, which makes debugging really hard.

This can easily be improved by wrapping the exception there:

-            throw new IllegalArgumentException(errMsg);
+            throw new IllegalArgumentException(errMsg, e);



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1398679 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 07:09:54 +00:00
Jacques Le Roux 6eb198e3c2 No functional change, just swap parameters positions in JavaDoc, while reading fast I got confused
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1393556 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 15:38:21 +00:00
Jacques Le Roux 3d1ccc11ed Closes "UtilXml firstChildElement should use getNodeName instead of getLocalName " https://issues.apache.org/jira/browse/OFBIZ-4441
The previous solution was not complete and prevented SOAP call to work correctly (see http://markmail.org/message/sz5esi3j6ombmrte).
This guarantee best of both worlds: uses getLocalName for SOAP if not null, else fall-backs to getNodeName


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1387878 13f79535-47bb-0310-9956-ffa450edef68
2012-09-20 06:57:10 +00:00
Jacques Le Roux 9dcd3564e3 Moves the workflow component to attic
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1381884 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 05:39:26 +00:00
Erwan de Ferrieres 5f2e3fffe5 Updating Apache HttpComponents to their latest version
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1376296 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 22:40:25 +00:00
Erwan de Ferrieres 0cd3370cc9 updating other Apache-commons libraries to their latest version
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1375502 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 12:29:14 +00:00
Erwan de Ferrieres 792e6a1729 updating some Apache-commons library to the latest versions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1375145 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 17:56:21 +00:00
Erwan de Ferrieres da60e4d9f4 Updating to latest nekohtml release 1.9.16
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1373435 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 14:44:31 +00:00
Adrian Crum 85d2a421a0 Updated ofbiz-properties.xsd.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1372510 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 16:58:31 +00:00
Adrian Crum aea294945e Added a warning comment to ResourceLoader.java. DOM object trees should not be kept in memory because they are big. Keep in mind the entire XML document is in the DOM tree - including comments, license headers, etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1370162 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 10:47:41 +00:00
Erwan de Ferrieres 1c15d2ab3e correcting an error with my search and replace at rev 1369357
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1369360 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 16:23:21 +00:00
Erwan de Ferrieres a41366e95f as suggested by Adrian, replacing @see by @Override in commit 1367751
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1369357 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 16:15:36 +00:00
Erwan de Ferrieres 6f363f4480 updating javadoc for Container#init
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1367751 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:25:26 +00:00
Jacopo Cappellato 0abd7c2f6d Moved some (commented out) container definitions to the components they belong to.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1365889 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 05:51:54 +00:00
Jacopo Cappellato 59aed51931 Removed some Geronimo/RMI specific code that was causing issues during system shutdown (several attempts to shutdown the RMIContainer); the code had also some tweaks that made the classes less readable; the static containerMap in ContainerLoader was breaking thread safety because the put operations were not atomic with the related add operations of the loadedContainers list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1363656 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 05:41:27 +00:00
Jacopo Cappellato 6137a3bf47 Minor change to set a consistent naming format for all the threads started by OFBiz.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1362417 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 09:05:33 +00:00
Jacopo Cappellato 78a8738a8f Minor change to use the Runtime class to get the number of processors rather than MxBeans.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361955 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 09:54:27 +00:00
Adrian Crum fe73aed662 Small cleanup in properties schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361922 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 07:16:35 +00:00
Adrian Crum 2a0058a04b New feature - performance metrics. Basic code and services.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1361722 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 16:07:59 +00:00
Jacopo Cappellato 42db3b8ca8 Removed "loader" element and all supporting code that I had recently introduced and that it is no more needed now that I have completed (in rev. 1360637) the support to set loader profiles in the startup properties.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360681 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 13:50:25 +00:00
Jacopo Cappellato 20b343d1f5 Unified all the different variants of *-containers.xml files into one; this has been made possible because now you can declare the container loaders in the startup properties; also moved some container definitions from base/config to the proper component.
It is now very easy to control the way containers are loaded.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1360637 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 11:34:41 +00:00
Jacopo Cappellato 9ccc542a28 Moved "naming-container" to the base component configuration file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356087 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 07:28:55 +00:00