Adrian Crum
86d58f1fb1
Clean up unusual initialization of StartupException in Start.java.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676100 13f79535-47bb-0310-9956-ffa450edef68
2015-04-26 11:59:42 +00:00
Adrian Crum
57977ab950
Code simplification in StartupException.java - remove custom code that duplicates functionality that already exists in super class Throwable.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676098 13f79535-47bb-0310-9956-ffa450edef68
2015-04-26 11:36:49 +00:00
Nicolas Malin
5f6c13b369
correct String conversion to Set on StringUtil that not respect the field order, thanks to Francis Douet to raise it on the issue (OFBIZ-6299 Field order is not correct in the auto-complete for look-ups.)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1675998 13f79535-47bb-0310-9956-ffa450edef68
2015-04-25 07:00:42 +00:00
Jacques Le Roux
23c89bab02
This defines the NotoSans font as default for report and FOP-PDF examples
...
With NotoSans by default, no need to specify the NotoSans "font-family" to write special characters in examples PDF (including content called from example).
This already worked in reports because of "fop.font.family=NotoSans" in fop.properties. It's also the way to use for custom reports.
I also added <auto-embed/> like we have <auto-detect/> but I'm unsure of what it does exactly (I suppose it embeds the fonts glyphs in the PDF) because the FOP documentation is unclear about it (to say the least). If someone knows better please chime in!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1675061 13f79535-47bb-0310-9956-ffa450edef68
2015-04-21 08:03:41 +00:00
Adrian Crum
4a6cd610ee
Some trivial optimizations in Config.java.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674546 13f79535-47bb-0310-9956-ffa450edef68
2015-04-18 17:45:20 +00:00
Ashish Vijaywargiya
d604e748d5
Applied patch from jira issue - OFBIZ-6260 - foScreenMacroLibrary.ftl renderLabel doesn't apply style parameter.
...
Thanks Christian for creating the issue and contributing the patch for the same. Thanks Aditya for reviewing the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674513 13f79535-47bb-0310-9956-ffa450edef68
2015-04-18 14:11:37 +00:00
Jacques Le Roux
3ecea0fd93
A patch from Pierre Smits "Move special purpose/jetty to attic" https://issues.apache.org/jira/browse/OFBIZ-6223
...
As per outcome of http://ofbiz.markmail.org/message/xoqjhbitdj5fi3bl remove special purpose/jetty from the trunk branch and add a notification to the attic document.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674482 13f79535-47bb-0310-9956-ffa450edef68
2015-04-18 11:44:52 +00:00
Adrian Crum
a2fc70daff
A small change to the behavior of the UtilProperties.createProperties() method: if the file is not found, return null instead of throwing an exception.
...
https://issues.apache.org/jira/browse/OFBIZ-6261
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674453 13f79535-47bb-0310-9956-ffa450edef68
2015-04-18 08:30:03 +00:00
Deepak Dixit
5fdc62745e
Applied patch from jira issue OFBIZ-4837 - Separator Error in data file tools.
...
Thanks Gil Portenseigne for reporting and providing the patch for the issue, Thanks Aditya for uploading the update patch and verifying it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674447 13f79535-47bb-0310-9956-ffa450edef68
2015-04-18 06:40:32 +00:00
Jacques Le Roux
d524de4d4c
No functional change, replace " by "
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674292 13f79535-47bb-0310-9956-ffa450edef68
2015-04-17 12:36:12 +00:00
Adam Heath
c589bdaa28
Well, this is the start of converting ofbiz to use maven for building
...
and packaging. There's a workable parent-pom, and I have converted
framework/start to maven as well. To use this, the following commands
are useful:
* mvn clean
* mvn compile
* mvn package
All 3 can be run in either ${ofbiz.home.dir}, or in framework/start.
The trick that made this simple, was that I was able to redefine maven's
default file layout away from src/main/java and target/*, to something
more ofbiz specific. This way of doing things is just to get things
going; eventually, we should adopt a more standard maven like layout.
Another thing not dealt with in these first 2 files, is downloading of
dependencies. The top-level and framework/start have no external
requirements, so it allowed me to get going quite quickly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674216 13f79535-47bb-0310-9956-ffa450edef68
2015-04-17 05:52:32 +00:00
Adrian Crum
a1bb4ff6bc
Fix warnings in trunk in Java source code - https://issues.apache.org/jira/browse/OFBIZ-6217 .
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1674064 13f79535-47bb-0310-9956-ffa450edef68
2015-04-16 13:05:55 +00:00
Jacques Le Roux
2d46984aec
Fixes a typo after a C/P
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1673912 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 18:14:18 +00:00
Jacques Le Roux
d4ae38b2ae
Revert r1673764 related with https://issues.apache.org/jira/browse/OFBIZ-6253 wrong: "Fixe <result-to-field> doc for <call-simple-method> in simple-methods-v2.xsd"
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1673880 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 17:22:20 +00:00
Jacques Le Roux
8122cbe2e3
Fixes https://issues.apache.org/jira/browse/OFBIZ-6254 "Minilang: type="NewMap" and type="NewList" for the Set element don't work"
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1673859 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 16:42:06 +00:00
Jacques Le Roux
d80c881c57
Fixes a wrong assertion, <result-to-field can only be used with inline scope.
...
Minor " to " changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1673764 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 13:45:43 +00:00
Nicolas Malin
6fbf256c28
Change performfind test sequence to escape a random error with dbcp, related to issue OFBIZ-6218 Unit tests throw exception in DBCP. Thanks Adrian for report it
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1673269 13f79535-47bb-0310-9956-ffa450edef68
2015-04-13 20:14:10 +00:00
Deepak Dixit
15be736b7a
Applied patch from jira issue OFBIZ-6222 - Change the field name 'tenantId' to 'userTenantId' from login page and ContextFilter
...
Thanks Arun Patidar for reporting the issue and providing the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1672853 13f79535-47bb-0310-9956-ffa450edef68
2015-04-11 09:43:10 +00:00
Deepak Dixit
4f6f1e6a9f
Applied patch from jira issue OFBIZ-6205 - Use EntityUtilProperties to get the WebSiteProperties
...
Thanks Arun Patidar for reporting the issue and providing the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1672846 13f79535-47bb-0310-9956-ffa450edef68
2015-04-11 08:50:42 +00:00
Nicolas Malin
7d94967a68
Convert javolution FastMap, FastSet and FastList by standard java.util.*
...
Related to OFBIZ-5781 Convert Javolution collections into Java collections
Thanks to Deepak Dixit and Adrian Crum for their help.
By defautl converted :
* FastMap by HashMap
* FastList by LinkedList
* FastSet by HashSet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1672752 13f79535-47bb-0310-9956-ffa450edef68
2015-04-10 20:22:54 +00:00
Jacopo Cappellato
fb0f2d3d1d
Fix for bug reported by Eric de Maulde in OFBIZ-5035: character encoding issue happening in the ecommerce application; the issue was caused by the CatalogUrlFilter and ContentUrlFilter because, under special conditions, they are preventing the ContextFilter (where encoding is set) to be executed.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1672430 13f79535-47bb-0310-9956-ffa450edef68
2015-04-09 17:33:44 +00:00
Jacques Le Roux
1e9549818f
Fixes a bug reported by Wai at https://issues.apache.org/jira/browse/OFBIZ-6234 "catalog main page show freemarker exception"
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1672252 13f79535-47bb-0310-9956-ffa450edef68
2015-04-09 07:40:15 +00:00
Jacques Le Roux
1788b6a224
Removes useless sentences according to Scott, after Adrian suggested to remove the HTML references.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1672081 13f79535-47bb-0310-9956-ffa450edef68
2015-04-08 12:50:15 +00:00
Jacques Le Roux
5f0ea0a387
Completes r1671519 for https://issues.apache.org/jira/browse/OFBIZ-6232 "Adds HTML tabindex into widget form fields"
...
There was still an issue when rendering renderLookupField from FTL templates
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1671847 13f79535-47bb-0310-9956-ffa450edef68
2015-04-07 13:49:53 +00:00
Jacques Le Roux
e5066b2ce5
No functional changes, just a bit of refactoring/cleaning
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1671758 13f79535-47bb-0310-9956-ffa450edef68
2015-04-07 08:21:49 +00:00
Jacques Le Roux
eb67d60fc3
Completes r1671519 for https://issues.apache.org/jira/browse/OFBIZ-6232 "Adds HTML tabindex into widget form fields"
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1671756 13f79535-47bb-0310-9956-ffa450edef68
2015-04-07 08:20:39 +00:00
Jacques Le Roux
fc90936482
Forgot to commit these changes at r1671519, I will complete the rest later today...
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1671524 13f79535-47bb-0310-9956-ffa450edef68
2015-04-06 12:24:06 +00:00
Jacques Le Roux
f903bdc355
Fixes a bug related to renderDateTimeField reported by Adrian's aon dev ML (when used from FTL templates)
...
Fixes also a bug related to renderLookupField when used from FTL templates with lookupField macro
I also spotted a number of other misc. trivial tabindex missing in other *FormMacroLibrary.ftl which should have not (or minor) effects on rendering. I will fix them later today...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1671519 13f79535-47bb-0310-9956-ffa450edef68
2015-04-06 12:11:18 +00:00
Jacques Le Roux
8e0222e137
Adds HTML tabindex into widget form fields. It allows to set the tab order of elements (when the "tab" button is used for navigating). For instance by column when columns are used with the position attribute.
...
Normally it's implemented for all concerned fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1671500 13f79535-47bb-0310-9956-ffa450edef68
2015-04-06 09:34:54 +00:00
Jacques Le Roux
3a047fadda
Mark this feature as deprecated, due to OFBIZ-6228
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1670999 13f79535-47bb-0310-9956-ffa450edef68
2015-04-03 06:43:26 +00:00
Nicolas Malin
d445d74d19
Apply patch OFBIZ-6209 Error when call updateNote service report by Supachai Chaima-ngua
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1670952 13f79535-47bb-0310-9956-ffa450edef68
2015-04-02 19:04:49 +00:00
Deepak Dixit
6f30b5de01
Fixed NPE while rendering content using screen widget, if content.dataResouceId is null then ModelScreenWidget throwing NPW.
...
Applied patch from jira issue OFBIZ-6219
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1669588 13f79535-47bb-0310-9956-ffa450edef68
2015-03-27 13:44:45 +00:00
Adrian Crum
f315f0d5be
Fix warnings in trunk in Java source code - https://issues.apache.org/jira/browse/OFBIZ-6217 .
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1669537 13f79535-47bb-0310-9956-ffa450edef68
2015-03-27 10:04:14 +00:00
Jacopo Cappellato
da98976ab0
Fixed code to prevent that two or more threads at startup run the same startup services (defined in serviceengine.xml using the startup-service element) more than once.
...
This will also prevent a deadlock condition (similar to the one fixed with rev. 1655046) that could occur at bootstrap under certain conditions and unlucky timing.
Thanks to Deepak Dixit and Ravi Lodhi for the report, tests and feedback.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668657 13f79535-47bb-0310-9956-ffa450edef68
2015-03-23 14:46:46 +00:00
Adrian Crum
f5a0e74f27
Added comments for cache settings. No functional change.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668351 13f79535-47bb-0310-9956-ffa450edef68
2015-03-22 10:27:58 +00:00
Adrian Crum
0f2db40ee3
Initial commit of the fix for the dirty cache reads problem - https://issues.apache.org/jira/browse/OFBIZ-5534 .
...
This fixes the PK cache only, the other caches will be fixed after this commit is reviewed.
I didn't include a unit test because Derby deadlocks while testing for this. Actually, the deadlock proves the problem is fixed. I will continue trying to find a way to provide a unit test.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668267 13f79535-47bb-0310-9956-ffa450edef68
2015-03-21 13:44:55 +00:00
Adrian Crum
755ee6ae6f
Oops, I forgot to include unit tests in my last commit.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668261 13f79535-47bb-0310-9956-ffa450edef68
2015-03-21 12:51:34 +00:00
Adrian Crum
f20303d0e3
Some work on GenericEntity and its subclasses: Enforce GenericPK != GenericEntity and GenericValue != GenericEntity.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668257 13f79535-47bb-0310-9956-ffa450edef68
2015-03-21 12:36:44 +00:00
Deepak Dixit
bdba71d230
OFBIZ-6183: Update ComponentConfig code to allow empty mount point, as if need to mount website on root then mount-point should be "" instead of "/".
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668236 13f79535-47bb-0310-9956-ffa450edef68
2015-03-21 11:14:55 +00:00
Adrian Crum
6dd1483da2
Some small optimizations in the entity engine - don't repeatedly build things that don't change over time.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668232 13f79535-47bb-0310-9956-ffa450edef68
2015-03-21 10:47:49 +00:00
Jacques Le Roux
39c362e60f
Move appserver component to Attic https://issues.apache.org/jira/browse/OFBIZ-6195
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1668192 13f79535-47bb-0310-9956-ffa450edef68
2015-03-21 04:01:29 +00:00
Jacques Le Roux
6c650d849a
A patch from Pierre Smits for "Adding GeoPoints overview to geo management" https://issues.apache.org/jira/browse/OFBIZ-6148
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667969 13f79535-47bb-0310-9956-ffa450edef68
2015-03-20 09:48:24 +00:00
Jacques Le Roux
4e2d290f69
Fixes <<You can't rely on Lookup field description-field-name attribute in a form having skip-start="true">> https://issues.apache.org/jira/browse/OFBIZ-6170
...
Instead of adding a form-name attribute only in lookup sub-element, I added it a the field level and removed the one at the lookup level.So the form-name field attribute can be used in the field of both the lookup and if needed the field set in the lookup description-field-name attribute. I only tested it in a version more near 13.07 but I believe it's ok here
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667774 13f79535-47bb-0310-9956-ffa450edef68
2015-03-19 14:38:37 +00:00
Deepak Dixit
4ae74fa8a9
OFBIZ-6183: Fixed String index out of range exception if webapp mounted on "".
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667733 13f79535-47bb-0310-9956-ffa450edef68
2015-03-19 12:55:28 +00:00
Jacques Le Roux
70410138ca
Fixes "Removes ASL2 license headers from files generated by create-component ant target" https://issues.apache.org/jira/browse/OFBIZ-6176
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667683 13f79535-47bb-0310-9956-ffa450edef68
2015-03-19 09:40:09 +00:00
Adrian Crum
9158c3af82
Fixed a bug in screenlet widget: If there is no Screenlet's preferenceKey in requestParameters, the initially-collapsed always be false. https://issues.apache.org/jira/browse/OFBIZ-6172
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667492 13f79535-47bb-0310-9956-ffa450edef68
2015-03-18 10:53:48 +00:00
Jacopo Cappellato
b387dcb2b4
Upgraded Tomcat from 7.0.57 to the latest bug fix release 7.0.59.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667253 13f79535-47bb-0310-9956-ffa450edef68
2015-03-17 10:52:34 +00:00
Jacopo Cappellato
38017100b3
Upgraded the following commons jars:
...
- codec from 1.6 to 1.10
- validator from 1.4.0 to 1.4.1
- logging from 1.1.2 to 1.2
- net from 3.1 to 3.3
- csv from 1.0 to 1.1
Resolves OFBIZ-6157, OFBIZ-6158, OFBIZ-6159, OFBIZ-6160, OFBIZ-6161
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667055 13f79535-47bb-0310-9956-ffa450edef68
2015-03-16 16:17:49 +00:00
Jacopo Cappellato
0db5888047
OFBIZ-6156: Upgraded commons-pool2 from 2.2 to.2.3 and commons-dbcp2 from 2.0.1 to 2.1
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1666958 13f79535-47bb-0310-9956-ffa450edef68
2015-03-16 10:58:26 +00:00
Jacopo Cappellato
f69e599355
Upgrade to latest bug fix release of Freemarker: 2.3.22
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1666949 13f79535-47bb-0310-9956-ffa450edef68
2015-03-16 10:31:13 +00:00