Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux 61e4de019a A patch from Arpit Singh Pandya for "Cancel/Done is not working correctly on Create User Login page." https://issues.apache.org/jira/browse/OFBIZ-5252
When we navigate on create user login page from party profile on clicking "Create New" link in User Name(s) Section, "Cancel/Done" is not working correctly on Create User Login page. partyId is missing with link. It is not working on trunk and 12.04, not sure about other versions. 

jleroux: 11.04 is concerned, 10.04 is OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497839 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 16:46:18 +00:00
Jacques Le Roux 538938e115 A patch from Petr Pytelka for "Czech localization (CommonUiLabels.xml)" https://issues.apache.org/jira/browse/OFBIZ-5249
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497731 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 10:57:33 +00:00
Jacques Le Roux 2d2e190856 A slightly enhanced path from Leon for "in zh locale, state does not change to "No States/Provinces exist" if select a country without any state defined" https://issues.apache.org/jira/browse/OFBIZ-5246
With "zh" (chinese) locale, coutry-state associated list, if you choose a country there's no any associated state defined in system, the state filed does not change.
cause: incorrect translate of "CommonNoStatesProvinces" for "zh" locale. In that, it use full-width colon ":" instead of half one plus blank space(": ").
why half-width and blank space (": ")? see code in "getDependentDropdownValues" function:

jleroux; I added a comment to prevent such cases in future

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497376 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 14:32:10 +00:00
Jacques Le Roux 1922c31b56 A patch from Petr Pytelka for "Czech localization (conditional.xml)" https://issues.apache.org/jira/browse/OFBIZ-5247
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497341 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 13:13:18 +00:00
Jacques Le Roux 5dba698b83 No functional changes while working on OFBIZ-4794
* Organize imports
* Fix wrong comments

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1495807 13f79535-47bb-0310-9956-ffa450edef68
2013-06-23 11:02:41 +00:00
Adrian Crum b23cbb323e Fix for NPE introduced in rev 1494057, reported by Ankit Jain on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494668 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 15:52:27 +00:00
Adrian Crum 129144e2bc Form widget sort field improvement - add the ability to specify help text on column headers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494057 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 07:58:25 +00:00
Jacopo Cappellato a4db370bbc Removed appender-ref reference that I forgot to remove as part of 1489461; thanks to Deepak Dixit for reporting this.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493658 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 06:57:40 +00:00
Jacques Le Roux 1c557fb0f7 Useless and possibly confusing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 09:23:04 +00:00
Adrian Crum b027bcc12e XsdToJava.ftl improvement - Append "Element" to class names to avoid name clash.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493474 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 07:36:08 +00:00
Adrian Crum 5fe2414094 Much smarter UtilXml.java nodeNameToJavaName method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493473 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 07:34:46 +00:00
Jacques Le Roux a07f94c3a6 A patch from Olivier Heintz for "Portal page personalization is not working" https://issues.apache.org/jira/browse/OFBIZ-5189
Two simples errors after last change from FastList to standard java List :
1) go to example component / Dasboard 
1.1) click on edit for one page
Screen is blocked
reason : 
{code}
                    for (GenericValue portalPage : portalPages) {
                        cond = EntityCondition.makeCondition(UtilMisc.toList(
                                EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, userLoginId),
                                EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, portalPage.getString("portalPageId"))),
                                EntityOperator.AND);
                        List <GenericValue> privatePortalPages = delegator.findList("PortalPage", cond, null, null, null, false);
                        if (UtilValidate.isNotEmpty(privatePortalPages)) {
                            portalPages.remove(portalPage);
                            portalPages.add(privatePortalPages.get(0));
                        }
                    }
{code}
code iterate on a list and modify it, I don't know how it could work before ;-)
I propose to use an other list on iterate 

2) on appbarclose.ftl for tomawak theme there is
{code}
    <#assign portalPage = delegator.findOne("PortalPage", findMap, true)>
{code}
when you click to "revert to original" in dasboard screen
{code}
Error on line 45, column 5 in component://tomahawk/includes/appbarClose.ftl delegator.findOne("PortalPage", findMap, true) is undefined. It cannot be assigned to portalPage The problematic instruction: ---------- ==> assignment: portalPage=delegator.findOne("PortalPage", findMap, true) [on line 45, column 5 in component://tomahawk/includes/appbarClose.ftl] -
{code}
2.1) to see the error, modify ExampleMenus.xml and change menu-item name from "Dasboard" to "Dasboard1" 
2.2) go to example / dashboard and edit one page
2.3) click to "revert to original"
I propose to add ?if_exists 

One other bug in portal page personalization.
When trying to delete portlet or column in portal page, there is an error because in delete service, cache is used to read data before remove.

Correction proposed is to remove use-cache="true"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493352 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 13:40:42 +00:00
Jacques Le Roux 3f08d5682d value attributes were not correctly closed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493332 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 09:19:29 +00:00
Adrian Crum f98fb17f6b Russian translations for SecurityUiLabels.xml and SecurityextUiLabels.xml.
https://issues.apache.org/jira/browse/OFBIZ-5226


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493327 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 08:14:07 +00:00
Adrian Crum 95cfc8f385 Russian translation for CommonEntityLabels.xml.
https://issues.apache.org/jira/browse/OFBIZ-5221


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493326 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 08:02:02 +00:00
Adrian Crum e6f6163b85 Fixed a bug in MacroFormRenderer.java where UEL expressions were not evaluated in Ajax elements.
https://issues.apache.org/jira/browse/OFBIZ-5227


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493325 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 07:56:22 +00:00
Adrian Crum d26546e774 Fixed a bug introduced in revisions 1480407 and 1481287 - form widget fields were not translated.
https://issues.apache.org/jira/browse/OFBIZ-5219


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1492112 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 08:29:41 +00:00
Jacques Le Roux d46e6023a7 Better formatting for lookup documentation while at it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491945 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 20:30:19 +00:00
Jacques Le Roux f668e3f671 A slightly modified patch from Leon for <<Make "showDescription" of <lookup> filed configurable individually>> https://issues.apache.org/jira/browse/OFBIZ-5211
For now, It's configured globally through "widget.lookup.showDescription" in widget.properties. 
In some case, we want to disable this feature for particular <lookup> filed. So we try to make it enabled.

1. update the widget-form.xsd to add new attribute "show-description" to <lookup> filed
  * if set this attribute explicitly to true or false, then showDescription feature is enabled or disabled respectively
  * if this attribute is not set (default), then showDescription or not depends on the "widget.lookup.showDescription" setting
2. modify ModelFormField and MacroFormRenderer to make it works
3. Since we introduce individual "showDescription" configuration, the global "SHOW_DESCRIPTION" was unable to work properly. It has been replaced by dynamic values
4. Show description function depends on ajax-autocompleter, but not vice versa. That's why the condition [options.showDescription != ""] was removed from _createAjaxAutoComplete function.

jleroux: I formatted the XSD documentation and used 

showDescription = "Y".equals(UtilProperties.getPropertyValue("widget", "widget.lookup.showDescription", "Y"));
instead of
showDescription = "Y".equals(UtilProperties.getPropertyValue("widget", "widget.lookup.showDescription", "N"));

Because, in widget.properties, widget.lookup.showDescription is Y by default (and I know that well, since I made this description working correctly in all cases)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491936 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 20:12:37 +00:00
Adrian Crum 34704f3fdc Some work on the security component:
1. Fixed the XSD.
2. Fixed a bad config file.
3. Removed cached DOM code.
4. Simplified Security factory code.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491345 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 05:53:54 +00:00
Jacques Le Roux e07c466c36 Implement the change for "Currently we can dynamically change the log level in webtools but not for a class or a package." https://issues.apache.org/jira/browse/OFBIZ-5207
If in Webtools Log Configuration, I check all debugging levels (ie add verbose to OOTB default), I don't get simple verbose lines in log, same with OFBiz trunk and all releases, but old R4.0 from 2007 where you get tons of lines (including debug lines from 3rd parties libs, this last feature still works in newer code versions).

By simple verbose lines I mean
{code}
Debug.logVerbose()
{code}
or
{code}
if (Debug.verboseOn()) Debug.logVerbose()
{code}
contrary to
{code}
if (Debug.verboseOn()) Debug.logInfo()
{code}
Which are of course shown ,if you force the debugging levels to verbose (I noted this scheme is often used in OFBiz OOTB).

When you set a logger to ALL (aka verbose) for a specific package or class, then also it does not work (no Debug.logVerbose() lines printed in logs)
I tried in webtools log config to add a logger to a class or/and package, set to DEBUG or ALL, and to even to use -DDEBUG=true system property (found in Debug class code), to no avail.

I barely checked the situation is the same from OFBiz R9.04 (included) to trunk.

Let me clarify again:
* Setting, dynamically or not, the verbose level, you get all Debug.log() levels lines in log, including lower levels like DEBUG (not used in OFBiz but in 3rd parties libs), but not the OFBiz Debug.logVerbose() lines
* Adding a logger for a class or package with ALL level does not work. You don't get the verbose lines of this class/package in logs.

With trunk demo, you can easily try both Webtools Log Configurations and any combinations running the getPartyFromEmail service from Webtools (paramater: ofbiztest@example.com) and checking the log: https://demo-trunk.ofbiz.apache.org/webtools/control/LogView.

I believe the previous behaviour (like in R4.0) where, when you set all debugging levels, you get all log lines including Debug.logVerbose() ones, is not wanted. You then get too much lines and it's barely usable (too much information kills the information). What I want: see only Debug.logVerbose() lines for a class or package, I don't want to see all Debug.logVerbose() lines (you never get them at the moment anyway) or if (Debug.verboseOn()) lines (you get them when checking all debugging levels).

I thought this was working, but I must say I never succeeded to get it working. So I thought it was my way of doing it. But now, I'm quite sure  it's an incomplete feature, that I even qualify a bug (we need that, even in previous releases)

As I said, putting the whole on Verbose level works but is not enough. You are then facing too much information and it blurs/clutters logs too much
Dynamically setting the log level for a class or package is most useful when willing to debug core features and even custom ones.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491188 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 12:05:33 +00:00
Adrian Crum c60b808b92 Reverting rev 1486552:
https://issues.apache.org/jira/browse/OFBIZ-5214


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491170 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 10:04:15 +00:00
Adrian Crum c1c2028fd4 Fixed a thread deadlock issue that seems to be specific to loading the MS SQL JDBC driver.
https://issues.apache.org/jira/browse/OFBIZ-5216


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1491165 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 09:24:49 +00:00
Adrian Crum 06ec6b5eaf Removed some code I introduced in recent commits where I was hoping to support reloading the entityengine.xml file in a controlled manor, but it seems to be causing thread deadlocks.
https://issues.apache.org/jira/browse/OFBIZ-5216


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490965 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 11:55:12 +00:00
Adrian Crum 91949082c1 Cleaned up the auto-generated code in the entity config models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490940 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 10:00:45 +00:00
Adrian Crum 18b5135a31 Third pass at removing cached DOM tree code from EntityConfigUtil.java. I converted some of the code to use the new thread-safe models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490938 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 09:34:47 +00:00
Adrian Crum 964a1d956d Second pass at removing cached DOM tree code from EntityConfigUtil.java. I converted some of the code to use the new thread-safe models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490678 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 15:18:27 +00:00
Adrian Crum e4b12f06c4 Fixed a bug caused by recent ServiceConfigUtil.java changes: https://issues.apache.org/jira/browse/OFBIZ-5212.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490549 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 08:57:05 +00:00
Adrian Crum 7b84188235 First pass at removing cached DOM tree code from EntityConfigUtil.java. I converted some of the code to use the new thread-safe models. I also fixed some concurrency problems in related classes by replacing DCL with java.util.concurrent classes. I discovered the new multi-threaded component loader was creating duplicate resources, so these changes fix that.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490541 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 08:39:44 +00:00
Adrian Crum a2622d1d37 Improved entityengine.xml models:
1. Added file name and line number to validation code so exceptions can show where things went wrong.
2. Convert some attributes to primitive types.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490535 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 08:21:22 +00:00
Adrian Crum 767deefce4 New models for the entityengine.xml file. These will be used to replace the DOM caching/parsing code in the same way as the service engine.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490187 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 08:02:14 +00:00
Adrian Crum 92d007e6f1 XSD-to-Java bug fix - fixed bad class field name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490144 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 05:16:08 +00:00
Adrian Crum a490245e67 XSD-to-Java bug fix - added missing throws clause.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490126 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 04:25:48 +00:00
Adrian Crum 32f9d30ca7 A final pass through ServiceConfigUtil.java - moved some of the convenience method code to the call sites. The convenience methods don't add much now that the API is easier to use. Reorganized methods and added JavaDocs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490116 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 03:29:50 +00:00
Adrian Crum 536a9e2f1f More work on ServiceConfigUtil.java - based on a patch from Christoph Neuroth with modifications by me. Client code now uses the new models and the DOM parsing static methods have been removed. The serviceengine.xml file handling is now thread-safe.
https://issues.apache.org/jira/browse/OFBIZ-5204


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490112 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 02:16:40 +00:00
Adrian Crum 06aea1b98a More work on ServiceConfigUtil.java - based on a patch from Christoph Neuroth with modifications by me. The static helper methods now use the models instead of parsing the DOM tree. This commit makes a small API change - the helper methods now throw an exception if there is a problem with the serviceengine.xml file. The original code would just hide the errors, so client code didn't know anything was wrong.
https://issues.apache.org/jira/browse/OFBIZ-5204


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490004 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 18:59:51 +00:00
Adrian Crum 7cfd3f4a3d Some convenience methods for the new models - based on a patch from Christoph Neuroth with modifications by me.
https://issues.apache.org/jira/browse/OFBIZ-5204



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490002 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 18:54:13 +00:00
Adrian Crum c3ceb113ea More work on ResourceLoader.java:
1. ResourceLoader instances are now thread-safe, though the static methods that cache DOM objects are not.
2. Code cleanup and better XML validation.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489801 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 10:38:06 +00:00
Adrian Crum 6073ef6dea Some first steps in fixing the concurrency issues in ResourceLoader.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489748 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 08:56:58 +00:00
Adrian Crum 89ce6062f6 XSD-to-Java improvement - better discovery of child elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489723 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 06:34:50 +00:00
Jacopo Cappellato 1dc46b9fd7 Some cleanups for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489476 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:33:30 +00:00
Jacopo Cappellato 4ae936a5f3 The content rendered in the Webtools "view log" screen is now rendered from the ofbiz.log file rather then the ofbiz.html file in order to provide more control on the html code rendered in the screen. This fixes the vulnerability CVE-2013-2137
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489461 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 14:48:40 +00:00
Adrian Crum 2dd19d3386 Small fixup for my last commit - remove comments used for development.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489366 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 10:13:48 +00:00
Adrian Crum e5eb503602 New feature: Convert an XSD file to Java source code. The feature creates immutable Java object models that represent the XML file defined by the schema. It supports an optional Visitor implementation.
The feature can be accessed in Web Tools by clicking on the XSD to Java link.

The Java source code is displayed in a text area - where it can be copied-and-pasted to your IDE. The source code is fairly complete, but you will have to fill in some missing bits.

If anyone wants to adapt the feature to make it a command-line utility, then that would be welcome.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489362 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 09:52:10 +00:00
Adrian Crum 33f04b40e7 New method for UtilXml.java - convert a DOM node name to a Java field name or Java class name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489360 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 09:41:34 +00:00
Jacques Le Roux 5bffbb20bf A fixing patch from Leon for "Some enhancement to password change." https://issues.apache.org/jira/browse/OFBIZ-5176
This line should not have been changed, "requirePasswordChange" can come from UserLogin not only "request"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488938 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 09:34:26 +00:00
Adrian Crum d1723ce249 JobPoller improvement - make it a ServiceConfigListener so service config file changes can be made at run-time. One <thread-pool> attribute doesn't get updated: "jobs" (the queue size) - which would require creating a new ThreadPoolExecutor instance, and that would require a lot of complicated synchronization code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488736 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 16:25:09 +00:00
Adrian Crum c7eb2f2622 ServiceConfigUtil improvement - notify listeners when the config file is reloaded.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488727 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 15:03:41 +00:00
Adrian Crum 43751eec49 Small improvement to the new service config models: move thread pool constants to the ThreadPool model, and initialize instances from the constant values.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488715 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 14:25:25 +00:00
Adrian Crum 528059c90d Improved attribute value validation in ThreadPool.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1488695 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 12:19:58 +00:00