Commit Graph
552 Commits
Author SHA1 Message Date
Adam Heath 819ddfc4b1 Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757046 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 22:46:22 +00:00
Adam Heath 162bfc9a01 Re-enable webslinger after fixing it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757014 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 20:54:19 +00:00
David E. Jones 3fa7eb414d A few minimal changes to disable webslinger build and container load so that we can build and run and everything other than webslinger will work; once Adam has identified the problem and can get it fixed this change should be reverted so that it is again building and loading by default
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756990 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 19:09:08 +00:00
David E. Jones 34f9e0a0f6 Added link-type=hidden-form attribute and parameter sub-element to the menu and screen widget link elements; some refactoring and cleanup to avoid too much code redundancy in this (though there is certainly still quite a bit here); changes the MyPortalMenus.xml#CommSubTabBar to use this since it is an example reported by Bilgin; WARNING: I don't have a good test case for this so testing from Bilgin or I guess Hans would be very appreciated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755022 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 22:12:30 +00:00
Bilgin Ismet Ibryam c3f28c69da Moved repeating method from EventHandlers to UtilHttp class
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754795 13f79535-47bb-0310-9956-ffa450edef68
2009-03-15 23:55:19 +00:00
Adam Heath 456003d059 Fix webslinger running against java 1.5.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753474 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 23:25:08 +00:00
Adam Heath 1115c4f400 Fix generics warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753334 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 18:03:33 +00:00
Adam Heath 9057861730 Add the appropriate configuration to allow webslinger to work at
runtime.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753084 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 01:18:54 +00:00
Adam Heath c32dd093b8 Add janino, but nothing uses it yet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753078 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 01:05:54 +00:00
Adam Heath f8b6cee335 Upgrade to a newer commons-vfs(a snapshot, unfortunately).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753077 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 01:02:45 +00:00
David E. Jones 73813a2201 Changed validation code for when allow-html=none, which is the default, to soften up on % and & since those are caught in the canonicalize process, so now only restricting greater-than and less-than characters, which should make HTML injection impossible when combined with the canonicalization that has strict double encode checking and such on
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752397 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 07:20:48 +00:00
David E. Jones 28e53b885c Changed the LRUMap inside CacheLineTable to be synchronized using Collections.synchronizedMap, should resolve issues reported in Jira #OFBIZ-2186
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751619 13f79535-47bb-0310-9956-ffa450edef68
2009-03-09 08:30:14 +00:00
Jacques Le Roux f0b05c11a9 switch( => switch (
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751007 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:56:24 +00:00
Jacques Le Roux f796e230d2 catch( => catch(
}else => } else

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:55:43 +00:00
Jacques Le Roux dfebb46e4b }else{ => } else {
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751004 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:51:02 +00:00
Jacques Le Roux 639a784790 while( => while (
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750998 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:38:03 +00:00
Jacques Le Roux fc6db9e886 if( => if (
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750997 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:36:09 +00:00
Jacques Le Roux 13a934f823 In spirit of Adam's r749341 and following http://java.sun.com/docs/codeconv/html/CodeConventions.doc7.html#489
The idea is also that a lot of code is duplicated and then changed (copy/paste). Hence having a rightly formatted code help to keep it rightly formatted
1st (simple) step : ){ => ) { (I checked all occurrences but of course other pairs of eyeballs are welcome)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750993 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:31:13 +00:00
David E. Jones 40fdb4076d Fixed issue with serialization exceptions on shutdown and startup: the RequestHandler class no longer implements serializable, it was never serializable anyway because it has member fields of types ServletContext, ViewFactory, and EventFactory which are not serializable; I tried making those transient or removing them to load dynamically after a bunch of changes realized that it doesn't make sense to serialize this class anyway, it contains no useful data that a user would care about, and all of its information comes from configuration files that we would want to reload on a restart or in another system or whatever
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750572 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 20:09:53 +00:00
David E. Jones 38449e8d9b Fixed issue (I think what Jacques was referring to) where makeMapSerializable was removing everything that wasn't a ServletContext because of bad logic; note that this causes the session attribute to not be seializable, resulting in shutdown and startup error messages, still working on that
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750560 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 19:33:46 +00:00
Adam Heath 867799286a Container that prints out the test cases that are available.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750089 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 18:02:07 +00:00
Jacques Le Roux cb74438cd4 Refactoring of ImageTransform, mostly
* Split into 2 classes one in framework/common : ImageTransform, one remains in product : ScaleImage.java
* Moved some labels used by ImageTransformCreated from ProductErrorUiLabels.xml in new CommonErrorUiLabels.xml  
* Moved Jdom from webapp/lib to base/lib, updated .classpath


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750018 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 14:22:55 +00:00
David E. Jones 7a247f7135 Some improvements to the last view and view save code to handle request attributes and more parameters, safe since they are never going int he URL or anything; this resolves the issues I was running into before with this, and hopefully with no side effects other than a few CPU cycles here and there; made sure that the stuff is serializable before putting into the session
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749970 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 11:49:27 +00:00
Adam Heath bea3dc678b Move some entity-specific code out of base, by making use of
javax.imageio.spi.ServiceRegistry, and META-INF/services.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749893 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 04:21:13 +00:00
Adam Heath b25c52b9b4 Should be the last of the executable removes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749178 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 04:18:30 +00:00
Adam Heath ec2441c8dc Remove executability from these files, that make no sense.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749176 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 04:06:50 +00:00
Jacques Le Roux c1edcce00f betterSolution.patch from Bruno Busco "Theme component should be loaded after applications component" (https://issues.apache.org/jira/browse/OFBIZ-2201) - OFBIZ-2201
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748332 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 22:15:57 +00:00
Jacques Le Roux cf6f655e20 Prevent false warnings in case of ${.*} syntax
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747596 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 22:59:45 +00:00
David E. Jones 6d5ced8365 Changed maxInputSize based on feedback from Al Byers
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747234 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 00:29:57 +00:00
Hans Bakker d5b26cec87 library 'serializer' added by accident, was already in the webapp/lib directory, as pointed out by Jacopo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746913 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 08:14:25 +00:00
Jacques Le Roux ded4edd6a0 A patch from Bruno Busco "Theme component should be loaded after applications component" (https://issues.apache.org/jira/browse/OFBIZ-2201) - OFBIZ-2201
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746905 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 07:27:50 +00:00
Hans Bakker 6a4d119dff upgrade fop 0.94 -> 0.95
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746645 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 07:59:30 +00:00
David E. Jones 2471cffc96 Addressed more issues with output encoding, based on feedback from Michele Orru in OFBIZ-1959 plus looking for other similar problems in code, and some random testing around; this should catch quite a bit more stuff as there were various places in the form, menu, tree and screen widgets that needed output encoding for data to be presented to the user through a browser; also a few cleanups here and there
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746409 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 23:00:36 +00:00
David E. Jones 368d99fa2d Changed the canonicalization and encoding to not use the CSS and JavaScript codecs, especially for canonicalization they cause problems with backslashes in strings which we generally want to allow and which generally isn't used in webapp input strings and I don't think we interpret such encodings anywhere so there is no danger nor utility for it; this better resolves the filename/etc problem reported by Jacques, so his temporary fix is now gone
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746292 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:47:31 +00:00
Jacques Le Roux 246090c0a6 BigDecimal in POS (complete). Integration of ofbiz-1945.patch changes (with some modifications) but still not used since it miss some features:
* AutoSave (automatically save current transaction)
* Add a saved sale to the current sale
* Remove a savec sale
* Replace current sale by a saved sale and remove simultaneously the saved sale

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745257 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:16:33 +00:00
Jacques Le Roux 36dc3600c3 Indicate clearly the status
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745025 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 12:49:22 +00:00
David E. Jones f27b4eeaaa No functional changes, just reorganizing code: moved email services from content to the framework/common component except the CommunicationEvent related ones which are now in the party component along with other CommunicationEvent resources; changed framework components so that webapp no longer depends on common and common is higher level than the various tool components which was an odd dependency before; one new thing is in here and that is an entity called EmailTemplateSetting which is meant to be a generic version of the ProductStoreEmailSetting entity so we can have configurable email templates without depending on ProductStore, still need to write the service to send email from this (sendMailFromTemplateSetting)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744727 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 19:34:49 +00:00
Jacques Le Roux 56ce285fc5 This enforces probability
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744657 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 11:48:36 +00:00
Jacques Le Roux 4eacbb164a This allows to use Windows paths from input fields (like from Entity import for instance)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744652 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 10:53:16 +00:00
Jacques Le Roux d5dc2d53ab Marco's LabelReferences2.patch from "New tool to get labels information" https://issues.apache.org/jira/browse/OFBIZ-2070 - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744635 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 08:42:06 +00:00
David E. Jones b4c3b96da5 Fixed issue reported by Ashish Nagar where the condition was checking for the same character twice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744420 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 08:23:13 +00:00
David E. Jones 1a5c2de3c5 Changed LoginWorker.makeLoginUrl back to returning a String and implemented a more general solution for the @ofbizUrl and @ofbizContentUrl tags so that they do decoding and are now tolerant of encoded URLs just in case it happens; this should be a more general fix and avoid the problem more; also a few cleanups like resolving warnings
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744418 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 08:17:05 +00:00
David E. Jones 80b9e4e2cc Changed LRUMap.get to be synchronized to hopefully resolve issue reported by Philippe Mouawad in Jira #OFBIZ-2186; comments in code discuss why this is needed; get is ONLY synchronized for the LRUMap, and not for caches where there is no size limit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744205 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 18:25:50 +00:00
Adrian Crum 86b75fa340 Oops, I meant to clean up this code before committing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743440 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 18:22:19 +00:00
Adrian Crum 8db1e5be50 Added util:urlExists(String url) function to the UEL functions. This should be helpful for testing if a file exists before trying using it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743436 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 18:19:11 +00:00
Jacques Le Roux e46e3c34e4 A patch from Marco Ruocco "Error using the UtilDateTime.addDaysToTimestamp method" (https://issues.apache.org/jira/browse/OFBIZ-2177) - OFBIZ-2177
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742933 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 10:47:01 +00:00
David E. Jones 0b71effc99 Added new shorter method to StringUtil called wrapString for getting a StringWrapper; added shared variable for StringUtil that is always there in FTL files so when string wrapping is needed one can just use StringUtil.wrapString(); added examples of this for the ProductPromo.promoText field in ecommerce; also set services for that field to allow safe html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742442 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 12:20:55 +00:00
David E. Jones 5d8d243a26 A simple StringWrapper object that can be used to get around the general HTML auto-encoding now done in FTL rendered through the Screen Widget; just call the static method to wrap it and it will insert fine and the encoder will leave it alone
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742412 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 11:55:07 +00:00
David E. Jones 09825430f1 Added new allow-html tag on the attribute, auto-attribute, and override elements; has 3 options: none, safe, and any; the comments in the XSD file describe what each of these do; the important thing to know is that none is the default meaning no html is allowed; if html is needed use safe and look at the antisamy-esapi.xml file to see policy details; in extreme trust cases use any where any html is allowed; note that many services need updating which should allow at least safe html, and it may take some time to discover all of those and get them handled; please send in issues and requests for service attributes that should allow safe html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742352 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 09:34:34 +00:00
David E. Jones ebd5c3e78f Implemented StringModel extension and BeansWrapper extension to load it in order to encode strings for HTML use; this is only done throught the HtmlWidget class that is part of the screen widget, so won't interfere with other FTL uses; note that there is other experimental code in here for wrapping the GenericValue object for html encoding, but that option wasn't very complete so went this way instead; this option behaves better and is more transparent than that escape x as x?html option for FTL files; there are also a few cleanups of typos and things in here; note that this means we have a different Configuration object and so a different template cache, and so we have different cache settings and such; after applying this I found a few places that encoded things they shouldn't but for the most part it is pretty good; will be committing some changes in applications in a bit to resolve a couple of these issues in ecommerce; all should watch out for funny things showing up as HTML text instead of being interpreted by the browser as HTML, meaning it was encoded; in extreme cases just comment out lines 71-73 of HtmlWidget.java to turn off this encoding
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742013 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 07:40:40 +00:00