Commit Graph
10472 Commits
Author SHA1 Message Date
Michael Brohl 960394e6c2 Improved: General refactoring and code improvements, package
org.apache.ofbiz.base.util.
(OFBIZ-9944)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818495 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 16:57:56 +00:00
Nicolas Malin a02c5c7358 Implemented: Website can manage hidden webapp (OFBIZ-10088)
Improve RequestHandler.makeLink code to manage url generation with surcharge the webapp path.
When a websiteId is present and it have a webappPatch define, use it on the link generation.

Example of use :
You have a httpd serveur that listen on *.mydomaine.com and define virtualHost myEcommerce.mydomaine.com and myCatalog.mydomaine.com
myEcommerce.mydomaine.com is a reverse proxy to myEcommerce.mydomaine.com/ecommerce
myCatalog.mydomaine.com is a reverse proxy to myEcommerce.mydomaine.com/catalog

Natively, all works fine with some parameters on web.xml and controller.xml but each link return are setted like that myEcommerce.mydomaine.com/ecommerce, called by apache httpd to ofbiz by myEcommerce.mydomaine.com/ecommerce/ecommerce and translate by ofbiz by ERROR ecommerce request-map not found

To solve the situation, I extended WebSite entity with attribute webappPath, init to / for websiteId ecommerce ofbiz instance and /ecommerce for other websiteId liked to other ofbiz instance (dev, back) without apache httpd with limited reverse-proxy.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818494 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 16:47:18 +00:00
Michael Brohl 6c98a1518d Improved: General refactoring and code improvements, package
org.apache.ofbiz.service.semaphore.
(OFBIZ-9945)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818485 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 13:44:14 +00:00
Michael Brohl 55d3ee92cb Improved: General refactoring and code improvements, package
org.apache.ofbiz.service.calendar.
(OFBIZ-9946)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818481 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:48:06 +00:00
Michael Brohl 0a63482c06 Improved: General refactoring and code improvements, package
org.apache.ofbiz.service.test.
(OFBIZ-9947)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818480 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:41:23 +00:00
Michael Brohl dc73716549 Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.cache.
(OFBIZ-9948)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818479 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:38:15 +00:00
Michael Brohl f3a43c5c9e Improved: General refactoring and code improvements, package
org.apache.ofbiz.entity.cache.
(OFBIZ-9949)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818478 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:34:39 +00:00
Michael Brohl e752662174 Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.renderer.
(OFBIZ-9950)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818477 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:32:01 +00:00
Michael Brohl dd64039161 Improved: General refactoring and code improvements, package
org.apache.ofbiz.entity.serialize.
(OFBIZ-9951)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818476 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:27:15 +00:00
Michael Brohl b1bf88f68f Improved: General refactoring and code improvements, package
org.apache.ofbiz.entity.test.
(OFBIZ-9952)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818475 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:25:11 +00:00
Michael Brohl fc3c0d3780 Improved: General refactoring and code improvements, package
org.apache.ofbiz.entity.finder.
(OFBIZ-9953)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818474 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:19:19 +00:00
Michael Brohl 639aefde1d Improved: General refactoring and code improvements, package
org.apache.ofbiz.service.job.
(OFBIZ-9954)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818473 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:12:00 +00:00
Michael Brohl 2a649a74ff Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.model.
(OFBIZ-9955)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818472 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 11:07:31 +00:00
Michael Brohl f48b282587 Improved: General refactoring and code improvements, package
org.apache.ofbiz.entity.condition.
(OFBIZ-9956)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818469 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 10:37:49 +00:00
Michael Brohl 1cca5dc166 Improved: General refactoring and code improvements, package
org.apache.ofbiz.entity.
(OFBIZ-9957)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818468 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 09:56:54 +00:00
Michael Brohl fe66233dc4 Improved: No functional change, removed obsolete import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818466 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 09:41:58 +00:00
Michael Brohl 8208ea0af2 Improved: Added conditions for logging (info, warn) and made the cookies
Array more readable in the log (FindBugs warning).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818465 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 09:41:04 +00:00
Jacques Le Roux d1bdee2c6c Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

This completes the work done so far by removing double check in cases not using 
brackets, like
if (Debug.verboseOn())
  if (Debug.verboseOn()) Debug.logVerbose()

Thanks: Michael for reporting this case I missed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818445 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 19:00:19 +00:00
Michael Brohl 1e9b5fea5c Improved: General refactoring and code improvements, package
org.apache.ofbiz.service.rmi.socket.ssl.
(OFBIZ-9959)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818444 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 18:55:57 +00:00
Michael Brohl 1b210f01ac Improved: General refactoring and code improvements, package
org.apache.ofbiz.widget.renderer.macro.
(OFBIZ-9960)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818443 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 18:00:42 +00:00
Michael Brohl b41f78ae1a Improved: General refactoring and code improvements, package
org.apache.ofbiz.entity.transaction.
(OFBIZ-9962)

I added some additional debug conditions.

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818441 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 17:28:52 +00:00
Michael Brohl 41c9269d25 Improved: General refactoring and code improvements, package
org.apache.ofbiz.datafile.
(OFBIZ-9963)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818434 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 16:18:45 +00:00
Jacques Le Roux 19d46a232a Fixed: Prevent the possible return of the Robot attack
(OFBIZ-10085)

After reading https://robotattack.org/ and testing 
https://robotattack.org/check/?h=demo-trunk.ofbiz.apache.org which returned 
(same for stable and old)

    This host is not vulnerable. 
    However it still allows connections with the problematic RSA encryption 
    ciphers.

I concluded that we should remove RSA encryption ciphers from our Tomcat config.
See https://tomcat.apache.org/tomcat-8.5-doc/config/http.html

This removes RSA from ciphers and also sslProtocol which is now TLS by default

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818402 13f79535-47bb-0310-9956-ffa450edef68
2017-12-16 13:46:35 +00:00
Jacques Le Roux 4928bf3ae5 Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

This completes r1818075, there were still few cases, a last regexp search is 
never too much :)

Found 4 other loops with Strings concatenation, but who cares, it's only 
verbose logging...

There should not be anymore...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818077 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 22:37:16 +00:00
Jacques Le Roux 735f946b83 Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

This completes r1818020, there were still few cases, a last review is never too
much

In PriceServices, I spotted
  for (GenericValue orderItemPriceInfo: orderItemPriceInfos) {
      if (Debug.verboseOn()) Debug.logVerbose(" --- " + orderItemPriceInfo
but it's OK with me, this should be rarely used, so not a perf issue


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818075 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 22:24:25 +00:00
Jacques Le Roux 40e8be83df Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

This completes r1818010, there were much more cases.
Also few tabs automatically replaced by spaces

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818020 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 14:11:38 +00:00
Jacques Le Roux 24b92d6921 Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

As spotted by Nicolas and reported on dev ML there was a case w/ a double check
This removes it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818010 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 13:09:52 +00:00
Michael Brohl e0a296741b Improved: removed unused imports.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818008 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 13:04:27 +00:00
Michael Brohl bb3fff1b21 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.util.string.
(OFBIZ-9700)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818007 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 13:03:03 +00:00
Jacques Le Roux e0d2057456 Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

We discussed on this point: http://markmail.org/message/mplvusuqn7oshl4v 
and we agreed about better doing a check when using Debug.logVerbose().

I checked there are 300+ cases like that. Since it's an easy S/R 
This implements it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818005 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:43:05 +00:00
Deepak Dixit 7e19de9966 Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818003 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:03:17 +00:00
Deepak Dixit 63258e90f8 Reverted r#1817989, workign fine locally, reverted for now will check and commit again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817998 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 10:42:32 +00:00
Deepak Dixit d1f85a7e5d Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817989 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 09:21:33 +00:00
Michael Brohl 2d13c73a02 Reverted: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.util.string.
(OFBIZ-9700)

There is an Exception being thrown during the tests, reverting and
investigating further.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817963 13f79535-47bb-0310-9956-ffa450edef68
2017-12-12 22:32:00 +00:00
Michael Brohl 216226db9b Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.util.string.
(OFBIZ-9700)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817935 13f79535-47bb-0310-9956-ffa450edef68
2017-12-12 16:41:06 +00:00
Michael Brohl bae1848cd8 Improved: General refactoring and code improvements, package
org.apache.ofbiz.base.component.
(OFBIZ-9872)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817883 13f79535-47bb-0310-9956-ffa450edef68
2017-12-12 06:26:29 +00:00
Michael Brohl 3c8804772d Reverted: General refactoring and code improvements, package
org.apache.ofbiz.base.component.
(OFBIZ-9872)

The patches were modified to remove Debug.is[Loglevel]On()
conditions. It is better to keep them for better runtime performance.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817882 13f79535-47bb-0310-9956-ffa450edef68
2017-12-12 06:24:37 +00:00
Jacques Le Roux c872ac1813 No functional change, damned hard day reviewing, these formattings I wanted to
keep 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817803 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 18:06:40 +00:00
Jacques Le Roux eb39aa5420 Removes some formatting which were also automated (w/o my consent, I must have
missed it at some point :/)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817799 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 17:35:42 +00:00
Jacques Le Roux a608c7ded1 No functional change, redo some formatting by hand to make code more legible
They obviously have been done with automated formatting (big formatted block).
Someone should check it's formatting width notably for comments and maybe JavaDoc

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817798 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 17:33:27 +00:00
Michael Brohl bf6310c5e4 Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.authentication.
(OFBIZ-9875)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817751 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 08:10:16 +00:00
Michael Brohl 4f48862e29 Improved: General refactoring and code improvements, package
org.apache.ofbiz.base.component.
(OFBIZ-9872)

The patches were modified to remove unnecessary Debug.is[Loglevel]On()
conditions, see OFBIZ-10049.

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817750 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 07:54:13 +00:00
Michael Brohl 76622f323e Improved: General refactoring and code improvements, package
org.apache.ofbiz.catalina.container.
(OFBIZ-9871)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817749 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 07:49:49 +00:00
Michael Brohl 6cca1c0dfc Improved: General refactoring and code improvements, package
org.apache.ofbiz.service.
(OFBIZ-9869)

The patch was modified to remove unnecessary Debug.is[Loglevel]On()
conditions, see OFBIZ-10049.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817746 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 07:18:37 +00:00
Michael Brohl ca83629678 Improved: General refactoring and code improvements, package
org.apache.ofbiz.base.container.
(OFBIZ-9861)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817744 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 06:41:08 +00:00
Michael Brohl 7cc0b229a6 Improved: General refactoring and code improvements, package
org.apache.ofbiz.base.util.collections.
(OFBIZ-9860)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817743 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 06:34:02 +00:00
Jacques Le Roux 48a2f6dc8b Fixed: Fix Default or Empty Catch block in Java and Groovy files
(OFBIZ-8341)

While reviewing recent Michael's FB commits I spotted a bunch of (unrelated) 
swallowed exceptions. This fixes them

Also few formatting and use of multi catches



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817703 13f79535-47bb-0310-9956-ffa450edef68
2017-12-10 12:00:07 +00:00
Jacques Le Roux 557a6194d5 No functional changes, removes useless code
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817701 13f79535-47bb-0310-9956-ffa450edef68
2017-12-10 11:44:28 +00:00
Jacques Le Roux b2810ccd5f No functional changes, simply formatting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817700 13f79535-47bb-0310-9956-ffa450edef68
2017-12-10 11:41:59 +00:00
Deepak Dixit bbd6590816 Fixed: Used entityName instead of null while using FormFactory.readFormDocument method, as this parameter is used to prepare formLocationCache, and its causing issue to view different entity from webtools. Now form will be cached based on enittyName#formName so it will working fine for all possible scenaraio
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817693 13f79535-47bb-0310-9956-ffa450edef68
2017-12-10 11:07:07 +00:00