Commit Graph
571 Commits
Author SHA1 Message Date
David E. Jones 3797437015 Changed to support a default-group-name per delegator, so that they don't have to specified for each entity; also some cleanups of the DelegatorInterface to remove deprecated stuff and add some new things, I still don't think that needs to exist but oh well
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672821 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 17:04:43 +00:00
Adam Heath f8581e214d Add another helper method to hide generics warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672804 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 16:05:01 +00:00
Adam Heath 795970df99 Use more Number.valueOf instead of creating new values all the time.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672703 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 04:39:50 +00:00
Adam Heath 2fabc92b17 Generied.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 04:32:58 +00:00
Adam Heath 9852126ed8 Based on what David discovered, made a correct fix; If srcdir and
<src> are both specified for <javac>, then they are added together,
instead of the latter overridding the former.  So, to override the
global src attribute in the javac macros, either set it explicitly
when called, or set it to empty, then use the nested <src> elements.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672699 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 04:27:54 +00:00
Adam Heath 124f1ed72d Revert previous change to just this file; some issue with the version
of log4j being compiled against.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672686 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 00:52:30 +00:00
Adam Heath 18391f98a9 The build.xml files are now much smaller and simpler; they reuse a
few global definitions.  1585 lines removed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@672657 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 18:39:36 +00:00
Jacopo Cappellato dbd34520d7 Cleaned up a bunch of warning messages for deprecated methods; in preparation for the framework release.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@671223 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 15:47:28 +00:00
Jacopo Cappellato d86e8129de Applied part of patch created by Joe Eckard in OFBIZ-1791: server info strings returned by the ServletContext are now compared ignoring case.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@671054 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 08:02:30 +00:00
David E. Jones 91a5ff11ff Removed old funny hex encode and decode routines from StringUtil, as they produced the same results as the commons library; found and fixed the real problem with the old entity engine encryption so that encrypted fields, including credit card numbers, couldn't be decrypted with the new code and it was the hashed key names no longer matched so the wrong DES key was used, ie a different one from the original key used to encrypt even if the original key was still in there; now it tries both, which is necessary because for systems updated before this went in there will be entries using the old DES key and some using the new DES key, so we can't just try one or the other; this should fix problems with credit cards and other encrypted value decryption after updating to fix the password hashing problem from a few weeks ago
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670731 13f79535-47bb-0310-9956-ffa450edef68
2008-06-23 20:15:27 +00:00
Jacques Le Roux 10676abb06 A patch from Michael Brohl "Configure cookie use for a module through the ofbiz-component.xml" (https://issues.apache.org/jira/browse/OFBIZ-1831) - OFBIZ-1831
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670268 13f79535-47bb-0310-9956-ffa450edef68
2008-06-21 23:02:59 +00:00
Jacopo Cappellato 7939c3c60b Upgrade to the Geronimo TX Manager 2.1.1; removed old Jencks jar.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670160 13f79535-47bb-0310-9956-ffa450edef68
2008-06-21 07:25:13 +00:00
David E. Jones 8beba39849 Fixed problem with old credit card and other old encrypted fields from before fixing the hex encoding, ie using what the rest of the world uses instead of the buggy old hex encoding that was previously used in OFBiz; now credit card numbers and other entity fields that are encrypted should unencrypt properly, ie it tries the new way and if decryption fails then is tries the old way
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670148 13f79535-47bb-0310-9956-ffa450edef68
2008-06-21 06:07:16 +00:00
Scott Gray b08bfae6e3 Fix an NPE, some typos and a label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@670108 13f79535-47bb-0310-9956-ffa450edef68
2008-06-21 00:53:09 +00:00
Jacopo Cappellato b2ac94a266 Added support for the skip-end attribute to form widgets of type "multi": now it is easier to add "global" form parameters to multi forms by concatenating a single form to a multi form with skip-end set to true.
Modified the way submitted multi form rows are counted: now the hidden _rowCount field in the form is no more needed because rows are counted in the ServiceMultiEventHandler (using the util methods that I have implemented in the UtilHttp class).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667930 13f79535-47bb-0310-9956-ffa450edef68
2008-06-15 06:27:15 +00:00
Jacques Le Roux 00c100aa40 A patch from Michael Brohl "FileUtil: write a file from a string with a specified encoding" (https://issues.apache.org/jira/browse/OFBIZ-1829) - OFBIZ-1829
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@664682 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 11:30:50 +00:00
Adrian Crum 8074d39e80 Fix for NPE reported by Jacopo on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@662825 13f79535-47bb-0310-9956-ffa450edef68
2008-06-03 15:20:10 +00:00
Adrian Crum e6cf1921c2 Small enhancement to the UtilGenerics class. Added two helper methods to make it easier to write type-safe code.
Now you can do things like

Map<String, Object> params = UtilGenerics.toMap(context.get("parameters"));

without causing compiler errors or throwing ClassCast exceptions.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@662589 13f79535-47bb-0310-9956-ffa450edef68
2008-06-02 22:20:54 +00:00
Adrian Crum 3cb3602fcb Small improvement to the MapStack class. The create(Map baseMap) method will create a standalone stack if baseMap is a MapStack. This will help reduce the code needed in calling methods.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@662511 13f79535-47bb-0310-9956-ffa450edef68
2008-06-02 18:40:05 +00:00
Jacopo Cappellato 2128610fa6 Based on a recent discussion in the dev list, and especially on the comments from David Jones and the work done by Adrian Crum, I'm committing a patch to refactor all the widget rendering methods and some of the content and Freemarker rendering classes to use Appendable instead of Writer. OFBIZ-1816
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@662328 13f79535-47bb-0310-9956-ffa450edef68
2008-06-02 05:27:12 +00:00
Adrian Crum 674077d6c2 Fixed bug in rendering Timestamp milliseconds, https://issues.apache.org/jira/browse/OFBIZ-1815.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661962 13f79535-47bb-0310-9956-ffa450edef68
2008-05-31 06:33:27 +00:00
Scott Gray 48c686d203 Applied patch from Raj Saini OFBIZ-1812, added additional support for Visa Electron card numbers
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@661677 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 12:13:29 +00:00
David E. Jones c434fd1614 Based on some comments from Joe Eckard and looking at the source for GroovyScriptEngine to see what it caches this now caches and runs based on parsed scripts, increasing performance
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660695 13f79535-47bb-0310-9956-ffa450edef68
2008-05-27 20:44:13 +00:00
David E. Jones 76196922b9 Fixed issue with groovy where if Script was cached the context was ignored; note that I could not find a thread safe way to run a parsed script, so this versio only caches the script text; need to find a way to parse just the script and run from the cache; the performance in this isn't terrible, but isn't good either
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660228 13f79535-47bb-0310-9956-ffa450edef68
2008-05-26 16:52:54 +00:00
David E. Jones dd61115acd Moving jpim from marketing to base to be more reusable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@660123 13f79535-47bb-0310-9956-ffa450edef68
2008-05-26 08:38:02 +00:00
Jacopo Cappellato cfd0f1c0c8 Upgrade to Tomcat 6
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@659490 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 10:26:46 +00:00
David E. Jones fd0c04be7a Fixed NPE introduced in a recent commit, reported by BJ Freeman
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658420 13f79535-47bb-0310-9956-ffa450edef68
2008-05-20 20:43:01 +00:00
Adrian Crum 6aea39757d Improved screen widget Ajax support.
The original Ajax work was a great start, but there were limitations. These changes open things up a bit: 1) Ajax rendering falls back to plain HTML when the user has JavaScript disabled. 2) You can have more than one area updated during an event.

IE7 updates only <div> elements, so be aware of that when using the Ajax feature.

See the Example component for a demonstration.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658281 13f79535-47bb-0310-9956-ffa450edef68
2008-05-20 15:33:22 +00:00
Adrian Crum a3536990f1 Locale and Time Zone refactor and bug fixes.
1. Modified the Start class to initialize the JVM default locale and time zone - configurable through start.properties. Removed calls to UtilDateTime.getDefaultTimeZone() - no longer needed.

2. Changed all calls to ObjectType.simpleTypeConvert(...) that didn't supply the necessary Locale and TimeZone objects. This fixes a lot of localization issues, https://issues.apache.org/jira/browse/OFBIZ-1696 being one of them.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@658045 13f79535-47bb-0310-9956-ffa450edef68
2008-05-19 23:50:14 +00:00
David E. Jones a713ad4bd7 Added support for groovy services, and an example of the same; cleaned up the way that bsh services work and updated the example and such to match, now returns a context as one would expect
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657701 13f79535-47bb-0310-9956-ffa450edef68
2008-05-19 00:22:46 +00:00
David E. Jones 20b7c98bb0 Added note about service def cache clearing, which works if done manually but not doing automatically because it results in reloading all service defs which is slow and causes BIG log messages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657700 13f79535-47bb-0310-9956-ffa450edef68
2008-05-19 00:20:25 +00:00
David E. Jones f3e72adfbc Added some missing libraries needed to run groovy scripts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657666 13f79535-47bb-0310-9956-ffa450edef68
2008-05-18 22:35:59 +00:00
David E. Jones d60415c2cb Added groovy support, implemented by Joe Eckard in jira #OFBIZ-1779; includes an example EditProductFeatures.groovy file showing somatures.groovy file showing some nice groovy syntax features, especially for Maps and Lists, though it isn't on by default yet in this commit, ie bsh still used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657645 13f79535-47bb-0310-9956-ffa450edef68
2008-05-18 21:57:07 +00:00
Adrian Crum 5bd8a77531 A couple of small fixups for the Ajax support.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@656693 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 15:05:38 +00:00
David E. Jones 050bbde29a Reverted fix from Hans that effectively disabled the method to remove the hash type prefix, and fixed the userLogin service code to and fixed the userLogin service code to remove the prefix from the db currentPassword value, which was missing and was causing the problem
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@656515 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 06:10:50 +00:00
Hans Bakker 0955b594c2 a better fix than rev 656100
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@656175 13f79535-47bb-0310-9956-ffa450edef68
2008-05-14 09:22:54 +00:00
Adrian Crum 4195b35a78 Added JavaScript detection to the framework. See https://issues.apache.org/jira/browse/OFBIZ-1648.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@655712 13f79535-47bb-0310-9956-ffa450edef68
2008-05-13 02:25:55 +00:00
Scott Gray 8ec7821177 Added a method to strip comments when parsing java files, the artifact info stuff was getting a bit confused by them
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@653181 13f79535-47bb-0310-9956-ffa450edef68
2008-05-04 05:38:38 +00:00
David E. Jones 0bc3a402fd Some improvements for password encryption based on ml discussions: now supports reading weird old password hex conversion, plus a more standard/correct hex conversion using Apache Commons Codex Hex class, plus an attempt to encode using a hash type in a prefix in the database; will always save the encoded password using the default type specified in the config file and will put a hash type prefix on it for portability
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@652224 13f79535-47bb-0310-9956-ffa450edef68
2008-04-30 01:58:00 +00:00
Jacques Le Roux 4973c9f293 This add the possiblity to run RMI services under WASCE or Geronimo.
There is only one small drawback : so far if you restart the OFBiz EAR from the console you loose the RMI Dispatcher. However stopping and starting (even after a restart) is OK. I guess it's the same for the commande redeploy, I will test tomorrow.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@652177 13f79535-47bb-0310-9956-ffa450edef68
2008-04-29 22:35:32 +00:00
Jacques Le Roux af63afe562 New version which automatically deploys in application server see https://cwiki.apache.org/confluence/x/IYBr for more informations
One base, one webapp, and the webtools web.xml files are slightly modified, nothing harmful anyway

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@646349 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 13:51:39 +00:00
Jacques Le Roux fd9aab4475 A patch from Yin T "Skip ".svn" subdirectories when searching for JAR files during ofbiz startup" (https://issues.apache.org/jira/browse/OFBIZ-1712) - OFBIZ-1712
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@645935 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 14:11:23 +00:00
David E. Jones b3ade46e61 Realized method name was bad for properties resource not found method, improved
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@645562 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 15:22:44 +00:00
David E. Jones e6e13652af Small refactor to preserve protected Map in UtilProperties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@645561 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 15:21:26 +00:00
Adrian Crum d0dff7df5e Fixed problem with entity engine trying to translate fields using properties files that don't exist. Reported by Jacopo in https://issues.apache.org/jira/browse/OFBIZ-1736.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@645278 13f79535-47bb-0310-9956-ffa450edef68
2008-04-06 18:06:06 +00:00
David E. Jones 616490c775 Artifact info related artifact lists are now all sorted
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@644386 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 16:02:16 +00:00
David E. Jones 3141bca290 Finished form to link/target request artifact info stuff
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@644179 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 06:06:48 +00:00
David E. Jones 9aa394bb90 Added some utility methods to parse partial URL strings common in OFBiz links, especially in the widgets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@644149 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 03:34:14 +00:00
Adrian Crum 3b6c0f2a5f Reverted the changes I made in rev 618892.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@643951 13f79535-47bb-0310-9956-ffa450edef68
2008-04-02 16:06:55 +00:00
Jacques Le Roux 4933725124 A change needed for WASCE tool
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@643174 13f79535-47bb-0310-9956-ffa450edef68
2008-03-31 22:10:06 +00:00