Commit Graph
2421 Commits
Author SHA1 Message Date
Jacopo Cappellato 0b16982849 Moved rmi-dispatcher container definition to the service component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1356074 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 05:55:25 +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
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
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
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
Adrian Crum ada9b6e78a Fixed a bug in DateTimeConverters.java where the wrong converter was being selected. The bug was due to class detection in the java.util.Date hierarchy - so the fix uses explicit classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1350081 13f79535-47bb-0310-9956-ffa450edef68
2012-06-14 03:32:18 +00:00
Jacopo Cappellato a610e70049 As discussed in the dev list, removed the experimental jcr component; its development will continue in the proper branch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1347478 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 08:14:28 +00:00
Jacques Le Roux e4432d69e2 We agreed on that on dev ML: easier to use
GroovyUtil.runScriptAtLocation()
than 
executeScript()
In case of error or debugging

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345840 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 06:07:19 +00:00
Adam Heath 27e88264a0 FIX: Prefix all log file names with ${ofbiz.home}, so when code is run directly from a subdir(when doing api testing), the logs are still placed at the top level. Previously, you'd end up with $PWD/runtime/logs scattered all around.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1344771 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 15:23:21 +00:00
Jacopo Cappellato fcdf07a0e6 Improved code that manages the cache:
* protected some UtilCache objects (static fields) by making them private and final

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343815 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:18:02 +00:00
Jacopo Cappellato 36737ad059 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343729 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:01:45 +00:00
Jacopo Cappellato 4eb06e3e00 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343728 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:57:19 +00:00
Jacopo Cappellato 126a9d40d5 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* removed unnecessary synchronization



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343727 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:52:32 +00:00
Jacopo Cappellato e316284fc9 Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* replaced some put with putIfAbsentAndGet to slightly simplify the code



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343717 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 13:33:29 +00:00
Jacopo Cappellato 9fe920a3f7 Improved code that manages the cache:
* removed unnecessary synchronization
* protected the UtilCache object (static field) by making it private and final
* replaced non atomic containsKey+put+get with get + putIfAbsentAndGet
* replaced containsKey + null check + get with get + null check



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343692 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 12:10:54 +00:00
Jacopo Cappellato 3eecd00954 Enhanced unit test for UtilCache.putIfAbsentAndGet method to better explain its behaviour: it returns the reference to the same object passed as argument only if the key was not already found in cache.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343291 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 15:39:02 +00:00
Jacopo Cappellato 074c282c0c Improved code that manages the cache:
* protected the UtilCache object (static field) by making it private and final
* instead of using the "put" method, use the "putIfAbsentAndGet" method to prevent the risk of adding the new value if another concurrent thread added it in the meantime



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343278 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 15:25:46 +00:00
Jacopo Cappellato ee53c9452b Some cleanups and changes to logging configuration:
* some misc formatting and changes to comments
* removed the old and unused configuration for minerva
* added a new file appender for Tomcat where all Tomcat internal logging is now redirected 
* changed internal logging for FOP from info to warn to be consistent with the settings of other external components (Tomcat, Geronimo Transaction Manager, Freemarker)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343269 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:41:50 +00:00
Jacopo Cappellato 7c91aaa74f OFBIZ-4901 Upgraded icu4j from version 4.4 to version 49.1; thanks to Deepak Dixit for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343261 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:05:29 +00:00
Jacques Le Roux b48ff3a62c Closes "Move SHARK to Attic" https://issues.apache.org/jira/browse/OFBIZ-4795
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343064 13f79535-47bb-0310-9956-ffa450edef68
2012-05-27 15:47:32 +00:00
Jacques Le Roux 7730a12e22 Renames nekohtml.jar to nekohtml-1.9.7.jar (found in MANIFEST) see http://nekohtml.sourceforge.net/index.html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343038 13f79535-47bb-0310-9956-ffa450edef68
2012-05-27 12:33:17 +00:00
Jacques Le Roux 621a487c35 Closes "Logs not generating on linux" https://issues.apache.org/jira/browse/OFBIZ-4877
I removed log4j-over-slf4j from trunk at in order to have logs in official Trunk demo. THis is part of the JCR effort which should be removed from trunk anyway since Sascha recreated a new JCR branch. I let him handle the rest...

I guess [Bridging legacy APIs|http://www.slf4j.org/legacy.html] has not been followed in details 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1342893 13f79535-47bb-0310-9956-ffa450edef68
2012-05-26 13:05:35 +00:00
Jacopo Cappellato 8de34f3f44 Upgraded Ant from 1.8.3 to 1.8.4 and "Commons Compress" from 1.4 to 1.4.1 in order to protect the system from vulnerability reported in CVE-2012-2098: Apache Commons Compress and Apache Ant denial of service vulnerability.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1342326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 16:36:09 +00:00
Adam Heath 49c0e405a9 FEATURE: Upgrade freemarker to a custom version that contains an
upcoming fix, filed in bug upstream at:
https://sourceforge.net/tracker/?func=detail&atid=100794&aid=3527625&group_id=794

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1341056 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 14:40:23 +00:00
Adam Heath 7c59f9068e OPTIMIZE: Add a static method that configures a BeansWrapper instance
for ofbiz use.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1341055 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 14:40:13 +00:00
Adam Heath 410079c235 OPTIMIZE: Move the getDefaultOfbizWrapper to earlier in the class; this
reflects the notion that BeansWrapper needs to be accessed/configured
earlier than Configuration, so ideally should come earlier in the list
of methods.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1341054 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 14:40:05 +00:00
Jacques Le Roux 69a54d528a Hastily removed at r1340414, needed by macros.xml (taskdefs javacc & jjtree)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340638 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 08:33:05 +00:00
Jacopo Cappellato 79ae52492a Refactored code to use the default BeansWrapper defined by FreemarkerWorker; this is important according to comment from one of the Freemarker committers:
"As of creating new BeansWrapper, be sure you create it only once during the application life-cycle and then reuse the same instance, or else it will have to rebuild the class introspection cache again and again."

Thanks to Adam Heath for the comment.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340631 13f79535-47bb-0310-9956-ffa450edef68
2012-05-20 07:49:45 +00:00
Jacques Le Roux e1183b6d16 Following https://issues.apache.org/jira/browse/OFBIZ-4833?focusedCommentId=13275249&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13275249
Moves to Attic:
    framework/base/lib/ant/ant-nodeps-1.8.1.jar => can be removed IMO. It was added with ant 1.8 by Hans, not sure why (no comment about need), seems to contains no needed stuff
    framework/base/lib/javacc can be removed IMO. The Java Compiler Compiler tm (JavaCC tm) - The Java Parser Generator, not used OOTB, was added by Marco, not sure why (no comment about need)
    framework/base/lib/Tidy.jar was used at bottom of eCommerce pages before, no longer needed
    framework/base/lib/ant-trax-1.8.0.jar can be removed IMO. It was added with ant 1.8 by Hans, not sure why (no comment about need), contains XSLT task
    framework/base/lib/commons/commons-vfs-20070730.jar certainly added with Webslinger can be removed now


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340414 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 10:57:40 +00:00
Jacopo Cappellato c60e7870fd Added new method "putIfAbsentAndGet" to UtilCache: it is similar to putIfAbsent but it always return the value even if the value was missing and added to the cache by method.
This can be useful to improve code like:

cache.putIfAbsent("key", "value");
value = cache.get("key"); // if a concurrent thread has cleared the cache the value could be null

into this:

value = cache.putIfAbsentAndGet("key", "value");



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340351 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 06:36:41 +00:00
Jacopo Cappellato 363ce98d69 Made the static variable Debug.dateFormat a private and final field because it is only used locally and DateFormat is not thread safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1340347 13f79535-47bb-0310-9956-ffa450edef68
2012-05-19 06:18:07 +00:00
Jacopo Cappellato 4aebe81b8f Based on suggestion from Daniel Dekany (committer/maintainer of the Freemarker's project):
"Since BeansWrapper.getDefaultInstance() returns an instance that is
 shared in the scope of the class-loader that defined the FreeMarker
 classes, and since possibly multiple independently developed
 components in your system use FreeMarker and thus getDefaultInstance
 (and you may don't even know about it), and since the returned
 BeanWrapper can be configured (not read-only), you never know how the
 returned BeanWrapper is configured. So you add a 3rd party component,
 and if you are unlucky, suddenly your other component is broken.
 As of creating new BeansWrapper, be sure you create it only once
 during the application life-cycle and then reuse the same instance, or
 else it will have to rebuild the class introspection cache again and
 again."
 
 I have replaced the usage of the static instance of the BeansWrapper with a newly created object. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1339504 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 07:25:13 +00:00
Adrian Crum f5fa8dcb5b Added a comment to UtilXml.java - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1339089 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 09:41:07 +00:00
Jacques Le Roux 2da70363b5 Revert all the changes related to CommonEmptyHeader, apart base-catalog.xml and labels in CommonUiLabels.xml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1339081 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 09:27:31 +00:00
Jacques Le Roux d8088bdd77 Deprecates w/out keepSpace versions of UtilXml.createOutputTransformer() and UtilXml.writeXmlDocument()
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338974 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 02:42:09 +00:00
Jacques Le Roux aede4717e1 Fixes and complete r1338831
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338845 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 19:26:39 +00:00
Jacques Le Roux 1c972bf684 Fixes https://issues.apache.org/jira/browse/OFBIZ-4652 "The Label Manager is wrongly overriding CommonEmptyHeader"
* Adds a keepSpace boolean to UtilXml.writeXmlDocument(), this allows to use xsl:preserve-space into UtilXml.createOutputTransformer()
* Uses it into SaveLabelsToXmlFile.saveLabelsToXmlFile()
* Adds some French labels into CommonUiLabels.xml using Labels Manager to test the new functionality 
* Adds the xml:space attribute into the valueType complexType
* Adds the ofbiz-properties.xsd schema into the base-catalog.xml

I got an issue when 1st trying to commit: 
Commit failed (details follow):
While preparing
 'D:\workspace\ofbizClean\framework\common\config\CommonUiLabels.xml' for commit
Inconsistent line ending style

So I forced the EOLs to my locale platform value (Win XP)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338831 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 19:03:26 +00:00
Adrian Crum f09c0db4d1 Change new FlexibleMapAccessor static method to an object method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338372 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 19:57:25 +00:00
Adrian Crum b4c01f24ff Small fixup for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338366 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 19:45:20 +00:00
Adrian Crum 025a75b632 Added a utility method to FlexibleMapAccessor.java to test for nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338361 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 19:43:18 +00:00
Jacopo Cappellato 53d6c971e9 Improved implementation of concurrent access to the cache of parsed Groovy scripts to avoid the risk of a NPE in the unlucky event that, between the execution of the cache.putIfAbsent and cache.get methods, the cache entry was removed (e.g. cache cleared/expired).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337789 13f79535-47bb-0310-9956-ffa450edef68
2012-05-13 07:16:18 +00:00