Adrian Crum
84064b8b1c
Small fixup for last commit.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766834 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 19:54:25 +00:00
Adrian Crum
27f82900f8
Fix for UEL expressions where IDs are used for Map keys.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766827 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 19:36:29 +00:00
Jacques Le Roux
46038493c4
Revert r766443 commited by accident
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766446 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 11:06:54 +00:00
Jacques Le Roux
59dcd48d1b
This was a commit error
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766443 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 10:27:47 +00:00
Jacques Le Roux
2ca2feef1a
Changes from Erwan de FERRIERES "Upgrade of the fop library (0.94 -> 0.95)" https://issues.apache.org/jira/browse/OFBIZ-2317 - OFBIZ-2317
...
+ LICENCE updated (libraries wiki page also updated)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766125 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 19:42:46 +00:00
Adrian Crum
35b8c43e36
Changes to the UEL classes - should fix the auto-vivify issues. Removed the UEL functions that were a workaround.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764992 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 22:53:59 +00:00
Adrian Crum
b38b6e9199
Small fixup for last commit - made the FlexibleStringExpander code comments more accurate. No functional change.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764534 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 17:08:15 +00:00
Adrian Crum
dc1c95d57f
Added expression escaping to FlexibleStringExpander.java, and put some examples in the Example component.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764527 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 16:56:06 +00:00
Adrian Crum
21ff1c14e9
Updated the JUEL library. Added two UEL functions for handling sequence IDs used as Map keys.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764323 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 20:39:52 +00:00
Adrian Crum
0638b39c8a
Removed unused/unnecessary classes and methods from framework/base. These were deprecated last November.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764308 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 18:02:00 +00:00
Jacopo Cappellato
6d29e3fc90
Applied patch from Ashish and Vikas, part of issue OFBIZ-1901 (Class cast exception on doing survey [ take survey ] on Customer Profile).
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763915 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 12:00:09 +00:00
Jacopo Cappellato
4fc035c159
The util method quoteStrList was adding two times the trailing ' to the elements. Formatting fixes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763509 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 04:06:48 +00:00
Jacques Le Roux
b9c3ddef08
2d part and end of an effort to remove trailing spaces
...
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg )
Of course this effort to remove trailing spaces has no functional implications.
Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {
So these changes are also in this commit, should not be a problem anyway.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
David E. Jones
89ba7ff311
Small change to groovy: stuff in FlexibleStringExpander to only interpret the expression/script on the initial parse and not each time it is run; tested with the stuff in the example component
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763105 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 05:14:23 +00:00
Jacopo Cappellato
640e11b07c
Misc fixes and enhancements to the new Macro renderer stuff.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762727 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 12:06:03 +00:00
Jacques Le Roux
a5042291f7
1st part of an effort to remove trailing spaces
...
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Andrew Zeneski
cc9b2baf9d
Added Groovy support to the FlexibleStringExpander; updated example component to show usage
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762610 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 03:17:31 +00:00
Adam Heath
b02b0154d1
Fix lines that *only* have whitespace.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759228 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:55:57 +00:00
David E. Jones
8c423bc529
Moved EntityDiagramGroupData.xml from entityext to commonext to resolve framework dependency; a few other little cleanups as well
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757639 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 02:53:31 +00:00
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