Ashish Vijaywargiya
863e160ede
Bug fix. Reset password functionality doesn't work in multi-tenant environment as expected. Lets say you have created UserLogin data in any of the tenant and has set UserLogin.requirePasswordChange="Y" then when user try to login into tenant then reset password functionality doesn't work as user expects.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1546782 13f79535-47bb-0310-9956-ffa450edef68
2013-12-01 06:58:40 +00:00
Adrian Crum
3afb5a5c06
Fixed a regression in ModelEntity.java caused by the recent thread-safety refactoring. Patch provided by Leon - https://issues.apache.org/jira/browse/OFBIZ-5399 .
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1543994 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 00:37:08 +00:00
Jacques Le Roux
a38a21fc0a
This closes "Introduce Tomcat's JreMemoryLeakPreventionListener and why" https://issues.apache.org/jira/browse/OFBIZ-5395
...
The idea is to avoid ThreadLocal with custom classes, this can lead to memory leaks when an external application server is used.
Reverts r1075322 (commit for OFBIZ-4107) hence removes CompilerMatcher
Uses PatternFactory instead of CompilerMatcher class (from CompilerMatcher keeps the compiled patterns cache idea)
In UtilHttp.java
Removes dead code
Removes useless "UtilHttp." for class methods and constants calls (moot point, have we conventions on this?).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542960 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 09:46:35 +00:00
Jacques Le Roux
de40fb6041
Makes createOrGetPerl5CompiledPattern static
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542959 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 09:45:33 +00:00
Jacques Le Roux
c2f81951cf
Adds the JreMemoryLeakPreventionListener, see https://issues.apache.org/jira/browse/OFBIZ-5395 for details
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542795 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 18:53:17 +00:00
Jacques Le Roux
be3985ea60
No functional changes, renames
...
https://cwiki.apache.org/OFBADMIN/mini-language-reference.html
to
https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542734 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 14:30:06 +00:00
Jacques Le Roux
98e992fc1d
Renames the Perl5 method createOrGetPerl5CompiledPattern, in case later we want to implement other regex flavors
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542725 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 13:52:11 +00:00
Jacques Le Roux
6387735b0d
Changes module and method names
...
Uses | instead of & in compile mask options
Adds a comment about when to use or not
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542709 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 11:35:49 +00:00
Jacques Le Roux
950192c0d0
No functional change, just simplify code.
...
Also some trailing spaces removed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542708 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 11:30:43 +00:00
Adrian Crum
39eb2da06e
Small fixup for me previous commit - Perl5 pattern compiler needs to be told the patterns will be shared among threads.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542551 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 19:03:17 +00:00
Adrian Crum
dbc3a522fb
Created a PatternFactory class to replace the existing CompilerMatcher class.
...
https://issues.apache.org/jira/browse/OFBIZ-5395
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542544 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 18:30:08 +00:00
Jacques Le Roux
e465eceb75
No functional changes, updates a link in a comment
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542530 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 16:18:12 +00:00
Adrian Crum
ba484bafa6
Fixed a C&P error in the startup code.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542513 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 13:55:25 +00:00
Adrian Crum
0711522378
Fixed a bug in EntityDataLoadContainer.java - do not use System.exit, throw an exception instead. Also moved help text to the exception message because it was not being logged before shutdown.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542495 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 12:26:16 +00:00
Adrian Crum
fac4fd0c42
Elaborate on my previous comment.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542464 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 04:32:01 +00:00
Adrian Crum
b34da96480
FIXME comments, no functional change.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542463 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 04:21:39 +00:00
Adrian Crum
2d2a3fa96e
Replace DCL pattern with AtomicReference in JmsListenerFactory.
...
https://issues.apache.org/jira/browse/OFBIZ-4455
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542442 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 01:30:56 +00:00
Adrian Crum
e04471523b
Fixed a bug in the setSyncServiceParameters screen. Some service parameter data types would cause FreeMarker to throw an exception.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542388 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 20:42:37 +00:00
Adrian Crum
405e24943d
Fixed a C&P error in the updateGeo service definition.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542264 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 13:34:06 +00:00
Paul Foxworthy
46392f7649
FORMATTING: Fix misspelling in comment
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542162 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 02:52:56 +00:00
Jacques Le Roux
ddf898a735
This reverts r1541641 + 1541746
...
Local variables are always thread safe, no needs to worry about them
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1541894 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 12:55:18 +00:00
Jacques Le Roux
e4529567c2
java.util.regex.Pattern instances are immutable but not instances of the Matcher companion class.
...
So better be safe than sorry, even if in the loops we loose a bit of performance (here only "short" loops anyway)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1541641 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 18:04:14 +00:00
Jacques Le Roux
90d37ce794
After my main external backup disk crashed, my main Eclipse workspace crashed also.
...
While rebuilding it, it seems I inadvertently pushed a OK button somewhere...
This reverts r1541470 and all pending stuff which should not have slipped in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1541485 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 12:01:48 +00:00
Jacques Le Roux
d0bd4e8617
This was committed by error
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1541470 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 11:07:04 +00:00
Scott Gray
287cec6e55
Remove null comparison because jobV can't be null at the given location
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1540551 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 21:06:50 +00:00
Adrian Crum
2ccdb6b312
Fixed a bug in WebSiteProperties.java where host name defaults were not initialized properly. Also added a toString method.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1540482 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 15:17:15 +00:00
Adrian Crum
7043dd0c6b
Fixed a bug introduced in rev 1534264 - unable to log into web applications that do not have a base-permission attribute.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1540475 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 14:02:47 +00:00
Adrian Crum
bfe1317c16
Fixed broken ModelInduceFromDb.jsp file.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1539781 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 19:44:41 +00:00
Scott Gray
338b68301b
global ECAs weren't honoring the run-as-user attribute defined on action elements
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1539645 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 14:06:54 +00:00
Adrian Crum
203ba5c608
Improved WebSiteProperties.java - better handling of missing values.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1539513 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 01:55:06 +00:00
Jacques Le Roux
4009a1f581
Fixes a bug reported by Eric Kingston at "Sales/Purchase Quote product id auto complete malfunction" https://issues.apache.org/jira/browse/OFBIZ-5379
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1537996 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 17:40:51 +00:00
Hans Bakker
0b22680991
some errors left from the removal of the postgresqlnew data resource
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1537396 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 07:45:36 +00:00
Jacques Le Roux
cdb662dd0a
A patch from Christian Carlow for "Wrap error messages in StringUtil.wrapString() for framework/common/webcommon/includes/messages.ftl" https://issues.apache.org/jira/browse/OFBIZ-5376
...
Without wrapping error messages in StringUtil.wrapString() the <br/> element appears part of the error message.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1537179 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 17:11:21 +00:00
Jacopo Cappellato
4c6d49b735
Upgrade to the latest version of Groovy: 2.1.9
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1537086 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 13:43:08 +00:00
Jacques Le Roux
13d207693b
A modified patch from Gareth Carter for "NotificationServices.java prepareNotification does not allow component:// urls" https://issues.apache.org/jira/browse/OFBIZ-5374
...
The prepareNotification method in NotificationServices.java does not allow urls that start with component:// because its using UtilURL rather than FlexibleLocation. Here is a patch that adds FlexibleLocation. I am not sure if its best to remove UtilURL or not - that can be up to you.
jleroux: since FlexibleLocation.resolveLocation() supersedes UtilURL.fromResource() I used it instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536905 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 22:00:33 +00:00
Jacopo Cappellato
489bee58c2
Upgrade to Tomcat latest bug fix release: 7.0.47
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536656 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 11:01:37 +00:00
Adrian Crum
6b416318af
Expose the TestSuiteInfo constructor so it can be used outside its containing class.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536586 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 04:27:07 +00:00
Jacques Le Roux
7adfe90d71
Fixes <<Services allow arbitrary HTML for parameters with allow-html set to "safe">> https://issues.apache.org/jira/browse/OFBIZ-5254
...
After r751990, <<allow-html="any">> and <<allow-html="safe">> are the same: they do nothing! The only difference is the warning message from the OWASP Antisamy IntrusionDetector, which is both, as Christoph noted "giving you a false sense of security" or as I wrote "disturbing, wrong and useless". So there are no longer any reasons for differencing "safe" and "any".
This
* Deprecates "safe" (making it clear in the XSD documentation), keeping only "none" and "any". This is for backward compatibility, else we could completely remove the misleading "safe". Note that "none" is the default.
* Replaces in services definition all allow-html="safe" by allow-html="any"
* Remove from ModelService.java (near line 587) the code which throws the OWASP Antisamy IntrusionDetector message in log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536324 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 12:12:43 +00:00
Adrian Crum
2a48bf829d
Fixed a bug in htmlMenuMacroLibrary.ftl - menu title threw an exception.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536217 13f79535-47bb-0310-9956-ffa450edef68
2013-10-27 23:03:54 +00:00
Adrian Crum
a770f0e853
Small fix for StringUtil.toMap method - avoid array index exceptions when a Map element is missing a value.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1536170 13f79535-47bb-0310-9956-ffa450edef68
2013-10-27 18:06:15 +00:00
Adrian Crum
33d54463cc
The RequestHandler.makeLink method uses the new URL generation classes (2nd try).
...
This time I preserved the complicated boolean logic in the host-part block of code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535755 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 14:57:25 +00:00
Jacques Le Roux
185925a648
No functional changes, just better documentation on status-code
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535669 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 09:50:21 +00:00
Jacques Le Roux
e0b12f5546
No functional change, just an updated comment
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535573 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 22:00:45 +00:00
Adrian Crum
5b675f5a79
Some code simplification in the new URL generation classes.
...
Also loosened things up a bit in the OfbizUrlBuilder class: allow object construction with partial information - required by some services. I don't like this approach because it makes it possible to create nonsensical URLs, but it is a necessary evil to keep the existing code working.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535444 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 17:12:46 +00:00
Adrian Crum
4af172cad4
Reverting rev 1535129 due to a problem reported by Jacques on the dev mailing list.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535419 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 15:44:03 +00:00
Hans Bakker
2d5f2903a3
fixed null pointer exeption will viewing a content record in webtools
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535291 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 07:03:52 +00:00
Hans Bakker
834c6ac2d8
revert of unwanted commit, sorry!
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535287 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:42:34 +00:00
Hans Bakker
45011c0ed1
reorganizing of files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535286 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:39:36 +00:00
Adrian Crum
6107ff911a
Fixed a bug in RequestHandler.java that threw an exception when the servlet is mapped to /.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535276 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 04:47:12 +00:00
Adrian Crum
9337f06205
Updated NotificationServices.java to use OfbizUrlBuilder.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535271 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 02:47:39 +00:00