Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux cbc7317064 A modified additional patch from Wai "widget <image> tag to use css for resizing" https://issues.apache.org/jira/browse/OFBIZ-4768
Changes in the relevant css files were not made. As a result the spinner is showing a horizontal repeat. This has been corrected.
Tomahawk themes/tomahawk/webapp/tomahawk/images/spinner.gif is now removed framework/images/webapp/images.spinner.gif will be used by all themes in order for the same consistent spinner image to be used.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328738 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 21:42:19 +00:00
Jacques Le Roux 24c36ab9a1 Moves guiapp component inside POS component
Closes https://issues.apache.org/jira/browse/OFBIZ-4807



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328727 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 19:19:09 +00:00
Jacopo Cappellato ebf04fde84 Synchronized read access to the parsedScript cache to avoid issues with concurrent thread visibility.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328641 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 12:19:31 +00:00
Jacques Le Roux 986c1ae6ac A patch from Daniel Riquelme "Enable NOT-IN operator to performFind" https://issues.apache.org/jira/browse/OFBIZ-4815
This patch will enable NOT-IN operator to the performFind service.
Only two lines of the file framework/common/src/org/ofbiz/common/FindServices.java were modified to enable de NOT-IN operator.
An use case is provided to test

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328637 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 11:38:14 +00:00
Erwan de Ferrieres 23e9a65a01 Moving example* applications to specialpurpose OFBIZ-4790
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328503 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 21:11:02 +00:00
Jacopo Cappellato 684fce1265 The cache of parsed Groovy scripts was not thread safe; this issue, in instances with several concurrent threads running the same script the first time (i.e. not cached) could cause the same script parsed multiple times and then added to the cache (overriding the previous value); this event was causing the clearing of caches in Freemarker; because of a bug in Freemarker [*] this could cause a deadlock.
The issue is present on all versions of Freemarker but it is less frequent on latest version because of the refactoring of caches happened after release 2.3.10.

[*] https://sourceforge.net/tracker/?func=detail&aid=3519805&group_id=794&atid=100794

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328356 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 12:53:35 +00:00
Adrian Crum a871ca4fac Some Mini-language validation code and other files in preparation for the syntax overhaul. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328302 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 10:26:38 +00:00
Jacques Le Roux 567080a8e3 Fixes a NPE introduced at r1328122
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328226 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 06:59:06 +00:00
Adrian Crum 500a2b4ec4 Added exception handling to the mini-language API. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328222 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 06:53:41 +00:00
Jacques Le Roux 5e5f0e27a5 This introduces a mean to hide a service result in log (when the service is longer than 50 ms and Debug.timingOn() or > 200 ms and Debug.infoOn(), see ServiceDispatcher.java, just above line 600)
A hideResultInLog service attribute is added. If set to true the service result will be hidden from possible exposition in ServiceDispatcher.runSync() 
This is convenient when used for sending a password to an user (the password must be legible in the sent mail). 
I'm sure a lot of you would want to have no logs at all in production. But by experience I know that we need to log info in logs even in production. Especially when the system is quickly moving ahead...
So this is a sure mean to hide any password in logs, being current or backuped somewhere on the servers disks...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328122 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 21:41:39 +00:00
Adrian Crum b64a9d940f Mini-language code format cleanup. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327981 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 15:09:03 +00:00
Jacopo Cappellato 3736c9856c Reverted rev. 1327736: with it it was impossible to log in with demo accounts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327866 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 08:43:54 +00:00
Sascha Rodekamp 83a3e0f6f4 Revert 1327835: accidently committed file WidgetWorker.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327839 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 06:30:36 +00:00
Sascha Rodekamp 94889bae2d Fix jackrabbit unit testing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327835 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 05:58:29 +00:00
Sascha Rodekamp 4c080a3d97 Fix jackrabbit unit testing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327834 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 05:56:56 +00:00
Adam Heath 4e165df74b FEATURE: Very simple command-line tool to crypt a password.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327742 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:49:28 +00:00
Adam Heath f092508550 FEATURE: Make use of new HashCrypt cryptPassword functionality.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327741 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:49:22 +00:00
Adam Heath ffd48b19c9 FEATURE: Add unix(glibc)-compatible password hashing, exact same output, with support for salts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327740 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:49:10 +00:00
Adam Heath 3cea0258d0 OPTIMIZE: Refactored LoginServices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327737 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:58 +00:00
Adam Heath 6ea609d022 FIX: Fix a bunch of hashed passwords that had the oldFunnyHex encoding.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327736 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:51 +00:00
Adam Heath 731a0d461f FEATURE/FIX: <entity-condition> on views are now done correctly. When a
view was previously joined to another view, the conditions on the inner
view were added to the outer-most WHERE clause.  This caused multiple
problems.  One, if the join was optional, the generated sql actually made
it required(because it was in the WHERE, and not in the ON clause).
Second, the outer WHERE may reference a field that was not available *at
all* in the generated nested select(view table).

The fix is to *not* recurse thru all view member entities when finding
conditions, and instead attach them to a new WHERE clause on the
generated inner SELECT(view table).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327735 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:40 +00:00
Adam Heath c029432953 FEATURE: Remove synchronization on UtilCache access in
ModelFieldTypeReader.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327734 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:33 +00:00
Adam Heath 96b4df930a FIX/FEATURE: When connecting views to their real entities, do a dependency sort, so
that a view that references another view is configured after it's
dependencies.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327733 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:26 +00:00
Adam Heath e5c44753c3 FEATURE: Remove synchronization on entity caching; this requires the
non-blocking features I added to UtilCache; without them, you'll get
internal map corruption.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327732 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:20 +00:00
Adam Heath 8069604927 FIX: No longer use LRUMap, but ConcurrentLinkedHashMap. This fixes the
case where getSerivceLogMap is called, and the elements are enumerated.
This could cause an error when the calling code was enumerating the map,
to print out it's information, but a service that was represented in the
map would finish, and get removed from the map.  The calling code that
had the map might then get stuck in a loop that would never end(internal
to the map itself).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327731 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:14 +00:00
Adam Heath 15869c914e OPTIMIZE: nothing in runLog.put can throw an exception, except for
standard OutOfMemory type conditions; therefore, there is no reason to
actually catch and log any exception that won't be thrown anyways.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327730 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:08 +00:00
Adam Heath ba0112fea4 OPTIMIZE: runLog can never be null, it's a static final; if for some
reason that fails at class init time, then an exception will be thrown
then, and the class will not be usable.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327729 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:01 +00:00
Erwan de Ferrieres 39c7dc647e Removing commons-compress-1.1.jar as not used anywhere in OFBiz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327667 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 20:29:19 +00:00
Sascha Rodekamp e14bb20f8d Small jackrabbit API code cleanups and refactoring, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327506 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 13:37:25 +00:00
Jacques Le Roux 2db2a99619 A modified patch from Wai "ajax autocomplete and dialog during session timeout" https://issues.apache.org/jira/browse/OFBIZ-4813
1. autocomplete feature shows the message "no records found" during a session timeout. This could be misleading for the user.
2. During a session timeout, clicking on ajax dialog button shows a large frame containing a message indicating session has timeout. Should show a more detailed message.

jleroux: what I adapted:
* Added <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> in htmlheader-for-ajax.ftl
* Replaced also spinner.gif in Tomahawk (better be consistent)
* Added a French label an kept those existing but English (improved by Wai)
* Removed the ajaxErrorText style in ajaxNotLoggedIn screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327502 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 13:24:30 +00:00
Sascha Rodekamp e4004ed672 Small code cleanups and refactoring for the Jackrabbit implementation, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327470 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 12:22:20 +00:00
Sascha Rodekamp de21687576 Form-Widget : Error in rendering Reset field. (https://issues.apache.org/jira/browse/OFBIZ-4821) A patch from Sumit Pandit. MacroFormRenderer.renderResetField contains a missing entry when appending title to renderResetField's StringWritter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327409 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 07:51:49 +00:00
Adam Heath b24617935b FEATURE: Start supporting commons-daemon explicitly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327257 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:58:09 +00:00
Adam Heath ba177f3aca OPTIMIZE: Add a new FAIL Control, and move the processing into a method on the
enum.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327256 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:58:03 +00:00
Adam Heath ecefbd3452 OPTIMIZE: Don't use static Strings to hold the commands sent over the
socket; instead, use an enum.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327255 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:57:57 +00:00
Adam Heath fffea48b81 FIX: Fix race condition in startup code; it's possible for all loaders to be
started, a shutdown command get's issued, stopping is occurring, but
then the server state ends up being set to RUNNING.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327254 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:57:50 +00:00
Adam Heath 39db7dfc5a OPTIMIZE: Remove the 2 boolean variables that encoded the startup/shutdown state,
and instead use a single reference, and an enum.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327253 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:57:44 +00:00
Adam Heath 940ee4480b OPTIMIZE: If the specified instrumentation class is not found, don't
bother printing the thrown exception; this is a standard situation,
where the required jar may not have been downloaded, and the
instrumenter not compiled.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327252 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:57:38 +00:00
Adam Heath f319440097 OPTIMIZE: Remove some debug prints from Start.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327251 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:57:28 +00:00
Adam Heath 83d2081e55 OPTIMIZE: Delete derby and hsql data dirs first, with verbose turned off.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327250 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:57:22 +00:00
Jacopo Cappellato 160982d9e7 Enhanced GroovyUtil to support the execution of data preparation methods defined in a Groovy script file (similarly to what is already supported by the ScriptUtil class for JSR223).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326996 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 08:44:43 +00:00
Christian Geisert 70939b1439 added/corrected a few German Labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-15 19:00:07 +00:00
Jacques Le Roux 4ba181855b Add version names to some libs, WIP...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326293 13f79535-47bb-0310-9956-ffa450edef68
2012-04-15 09:42:42 +00:00
Jacques Le Roux 6dec5661a3 Replaces ProductCountry and mostly PartyCountry by CommonCountry and merges all labels in CommonCountry
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326270 13f79535-47bb-0310-9956-ffa450edef68
2012-04-15 08:24:45 +00:00
Erwan de Ferrieres 0b7c9aa68b Upgrading to latest ant version: 1.8.3
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326132 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 15:38:17 +00:00
Erwan de Ferrieres 8b8f386f6a Upgrade to tomcat 7.0.27
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326090 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 12:07:15 +00:00
Jacques Le Roux 50cbd9b4f3 Complete r1326064, moreover I forgot to save the others *-containers.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326080 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 09:59:33 +00:00
Jacques Le Roux 86ca2bcd04 Complete r1326064, I forgot to save ofbiz-containers.xml before committing and did not notice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326072 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 08:49:05 +00:00
Jacques Le Roux 8c481181d5 Adapted by hand from Lon F. Binder "CatalinaContainer Doesn't Respect <distributable/> Node for web.xml files." https://issues.apache.org/jira/browse/OFBIZ-4242
Per the servlet specification, the web.xml file should allow an optional <distributable/> node to indicate that the application is clusterable. Currently, OFBiz does not respect this setting and assumes all applications should be distributed if any cluster configuration is provided in the ofbiz-containers.xml file. As a result, if, for example, the DeltaManager is enable, all applications attempt to cluster and communicate via DeltaManager.

The expected and proper functionality is to check the individual application's web.xml file for the <distributable/> node and only use the DeltaManager if found; otherwise the StandardManager should be used for sessions.

jleroux: replaced some tabs, reformatted, added a comment about <distributable/> in the *-containers.file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326064 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 07:30:30 +00:00
Christian Geisert 6881ce39aa Moved Swiss German ("Offerte") to de_CH labels
See OFBIZ-2862


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1325807 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 15:37:04 +00:00