Commit Graph
142 Commits
Author SHA1 Message Date
Jacques Le Roux a6364a8afa Improved: Remove Docbook parts now useless since Ascidoc is used for online help (OFBIZ-12327)
At https://markmail.org/message/inoihmcon37wq5zz I suggested:

If I'm not wrong, we no longer use Docbook anywhere. So I suggest to remove it
from:

1. cmssite component, where it was used by the online help, now assured by
    Asciidoc. BTW, for whom it could concern, I noticed that anchors jumping
    in adoc files does not work in online help
2. docbook.dtd in content component only used by the cmssite component
3. docbook.css in themes, I'm not sure that still useful there
2021-09-25 10:32:53 +02:00
Jacques Le Roux 190e816364 Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
This prevented to run the stable demo, hence the next, weirdly the trunk had
not this problem. Anyway better safe than sorry... Maybe related to Gradle
version or rather libs loaded?

The reason why the stable (and old) demos were not running is because the
EntitySaxReaderTests did not pass
2021-07-20 07:47:25 +02:00
Jacques Le Roux 6106277bb4 Improved: Add global web.xml to simplify session timeout configuration (OFBIZ-12255)
Currently, session timeout is configured in apps separately, but session is
shared globally, so the smallest one take effects, and it will not take effect
separately for different apps.

Then it is both inconvenient and confusing to increase session timeout value,
as all values in those files need to be updated.

A global web.xml is needed, to simplify session timeout configuration.

Thanks: Xin Wang
2021-06-22 08:52:44 +02:00
Jacques Le Roux e964d61724 Improved: Default ordering of webapps titles in main menu (OFBIZ-12166)
This 1st step sorts the plugins. We need to discuss more...
2021-02-14 21:12:52 +01:00
holivier 2f6b0f19a3 Documented: remove from plugin cmssite link to document genereted from docbook help files 2020-10-26 18:45:19 +01:00
Suraj Khurana 6dfc3c19e7 Improved: Corrected some extra spaces and naming conventions related checkstyle issues.
(OFBIZ-11921)
Also fixed some access modifiers for some private class members. Thanks Jacques Le Roux for review.
2020-08-31 20:01:25 +05:30
Suraj Khurana 1207d24062 Improved: Make data members of class as private and added accessor methods for the same, also corrected occurences of the same in plugins component.
(OFBIZ-11963)
Also made some related checkstyle code enhancements.
Thanks jacques for finalizing Javadoc pattern during this effort.
2020-08-22 13:22:19 +05:30
Suraj Khurana 30f796146c Improved: Corrected some line is longer than 150 characters checkstyle issues. Also fixed some extra spaces and naming conventions related checkstyle issues.
(OFBIZ-11921)
2020-08-03 10:07:16 +05:30
Jacques Le Roux a0f7e77e77 Improved: Use Error.ftl everywhere it's not yet used (OFBIZ-11890)
Removes all error*.jsp reference, no longer used
2020-07-20 19:27:23 +02:00
Suraj Khurana e7ead3697f Improved: Corrected all checkstyle formatting issues: Line has trailing spaces in plugins component.
(OFBIZ-11880)
Thanks Jacques for review.
2020-07-13 14:14:42 +05:30
Suraj Khurana c24db772c9 Improved: Corrected all 'if is not followed by whitespace' checkstyle errors. Also corrected few ', is not followed by whitespace' checkstyle errors.
(OFBIZ-11805)
Thanks Jacques Le Roux and Ritesh Kumar for review.
2020-07-06 15:28:07 +05:30
Suraj Khurana ae31c01fa7 Improved: Change resources with proper naming convention in all plugin components.
(OFBIZ-11739)
Also, made MODULE as private data member of class instead of public. Thanks Jacques for review.
2020-05-29 13:14:02 +05:30
Mathieu Lirzin 1158664ba3 Fixed: Add XML declaration in “web.xml” files (OFBIZ-6993)
These declarations avoid SAXParseException traceback when parsing web.xml
the first time in WebappUtil.parseWebXmlFile

A schema conformance issue has been fixed in ecommerce “web.xml”.
2019-12-07 22:52:30 +01:00
Jacques Le Roux 844fc542d8 Fixed: Add session tracking mode and make cookie secure
(OFBIZ-6655)

Following "Session timeout for webapps" discussion on dev ML 
https://markmail.org/message/p6fbiojjrwb2ybxd

We decided to put back the session-timeout value in web.xml files and to remove
the line
    session.setMaxInactiveInterval(60*60); //in seconds
from ControlEventListener.java

Thanks: Deepak Nigam for report and Girish Vasmatkar for discussion

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1851068 13f79535-47bb-0310-9956-ffa450edef68
2019-01-11 16:12:01 +00:00
Jacques Le Roux 695301d303 Improved: Fix or Silence various warnings
(OFBIZ-10701)

In order to detect potential issues early, the linting compiler option should be 
used by default and disabled with {{./gradlew -PXlint:none build}}.

Additionally it is important to reduce the number of warnings otherwise new 
warnings will remain unnoticed.

The warning related to the com.googlecode.concurrentlinkedhashmap dependency 
should resolves itself once we handle upgrade to Caffeine like proposed in 
OFBIZ-6747.

Thanks: Mathieu Lirzin

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1848673 13f79535-47bb-0310-9956-ffa450edef68
2018-12-11 13:33:49 +00:00
Deepak Dixit 443411cdf4 Improved: Use application/javascript instead of text/javascript
(OFBIZ-10492)
Replace text/javascript with application/javascript in all the script tag

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836889 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 11:50:09 +00:00
Deepak Dixit bee4c75cfb Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)
I did note test the dockbook rendering, but it should work

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836551 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 12:42:53 +00:00
Deepak Dixit 1f164336e9 Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1836546 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 11:27:20 +00:00
Rishi Solanki c1c14b8e9c Improved: Remove empty field values from xml data files so that it will not override existing data with empty values. Removed all empty data fields from data files plugins components.
(OFBIZ-10282)
Thanks to Arun Patidar for reporting and review.
Thanks to Suraj Khurana for providing patch for the improvement.
Thanks to Jacques for discussion and finalizing the work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1830546 13f79535-47bb-0310-9956-ffa450edef68
2018-04-30 10:56:31 +00:00
Jacques Le Roux 113b989d51 Completed: Remove applet concept in OFBiz
(OFBIZ-10094)

Completes r1818646, these should not have changed (not OFBiz code)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1819046 13f79535-47bb-0310-9956-ffa450edef68
2017-12-22 15:26:59 +00:00
Jacques Le Roux 98b955ea20 Completed: Remove applet concept in OFBiz
(OFBIZ-10094)

Completes r1818646, again forgot the plugins :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1819019 13f79535-47bb-0310-9956-ffa450edef68
2017-12-22 09:28:17 +00:00
Michael Brohl bced76ed99 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.cmssite.multisite.
(OFBIZ-9626)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1817929 13f79535-47bb-0310-9956-ffa450edef68
2017-12-12 16:22:21 +00:00
Jacques Le Roux 6bb17c236d Improved: The main logo in screen upper part shows distorted
(OFBIZ-9990)

Forgot the plugins :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1816932 13f79535-47bb-0310-9956-ffa450edef68
2017-12-02 07:35:37 +00:00
Jacques Le Roux 392cdc25e6 Improved: Hardcoded stylesheets and javascript resources
(OFBIZ-)

The 'HtmlHead.ftl' file of the cmssite component contains following hardcoded 
style sheet and javascript resources:
•/images/fieldlookup.js
•/images/selectall.js
•/images/ecommain.css
•/ecommerce/images/blog.css
•/content/images/contentForum.css

Thanks: Pierre Smits, Anil and Swapnil

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1815798 13f79535-47bb-0310-9956-ffa450edef68
2017-11-20 12:41:46 +00:00
Deepak Dixit f02613b01b Improved: No functional change, Only added license header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1812310 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16 18:43:49 +00:00
Deepak Dixit 97ae936753 Improved: Updated ecommain.css reference, as its moved from common theme to ecommerce (OFBIZ-9771)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1811222 13f79535-47bb-0310-9956-ffa450edef68
2017-10-05 18:26:49 +00:00
Deepak Dixit ae025f88ee Improved: Updated contentForum.css path in plugins.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1811131 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04 18:57:13 +00:00
Jacques Le Roux 646e2e9d47 Improved: Add session tracking mode and make cookie secure
(OFBIZ-6655)

Programmatically replaces the web.xml <session-config> declarations and uses 
the @WebListener annotation to start the process. This avoid to duplicates 
things everywhere in web.xml files. Since the web.xml files have precedence 
on annotations, the setting can be easily overridden when necessary.

Now that we also use HTTPS in ecommerce the ecommerce session cookie is 
also secured.

I also noted that we had 8 weird <session-timeout> declarations:
    in solr component: <session-timeout>2</session-timeout>
    in themes: <session-timeout>1</session-timeout>

Also in Rainbowstone we lacked the <cookie-config> and <tracking-mode> 
declarations. I think it's not good.

I resolve these points by simply removing the <session-config> in web.xml files 
of themes and Solr.

Thanks: Pradhan Yash Sharma  for review

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1811041 13f79535-47bb-0310-9956-ffa450edef68
2017-10-04 07:12:57 +00:00
Deepak Dixit d4b11cf0a4 Improved: Updated moved file references for plugins (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1809393 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 11:10:35 +00:00
Taher A. Alkhateeb 5bdc75e434 Implemented: removed unnecessary classpath entry from cmssite component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1799778 13f79535-47bb-0310-9956-ffa450edef68
2017-06-24 19:46:05 +00:00
Jacques Le Roux c47f662d38 Fixed: Wiki restructure issues
(OFBIZ-9416)

Replaces a bunch of deprecated links or shortcuts

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1799698 13f79535-47bb-0310-9956-ffa450edef68
2017-06-23 19:57:35 +00:00
Deepak Dixit f7eb59f52d Fixed: After the implementation of new servlet filter for controller related logic, the multisite feature was not working properly due to URL modification. This control filter can not be applied to cmssite because that web application is intended to use dynamically publish URL. So we can remove the control filter from web.xml of cmssite.
Thanks Jacopo Cappellato for discussing the possible solution on this issue. (OFBIZ-7120)
  
 Thanks Mohammed Rehan Khan for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk@1796382 13f79535-47bb-0310-9956-ffa450edef68
2017-05-27 11:42:27 +00:00
Taher A. Alkhateeb 436c99ca6d Implemented: renamed the directory specialpurpose to plugins
(OFBIZ-7972)

In another step towards completing the plugin system for OFBiz, we renamed
the /specialpurpose directory to /plugins and changed all occurences of the
word "specialpurpose" to "plugins" in all files found in the system

Reference discussion: http://markmail.org/message/hpyuxkmftiyn44w2


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1778271 13f79535-47bb-0310-9956-ffa450edef68
2017-01-11 10:48:47 +00:00
Divesh Dutta bef0bc4eb3 Improvement: Generic value is null or not should be checked using native checks. Utility method isEmpty or isNotEmpty is not needed to check if generic value is null or not because generic values can never be empty. They can be null or not nulls. So made changes accordingly all over the places.
(OFBIZ-8471)

Thanks: Ratnesh Upadhyay for reporting the improvement and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1768192 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 11:27:46 +00:00
Jacopo Cappellato a91e8cd19e Improved: a series of cleanup mostly related to no more necessary handling of
default encoding for the requests and some fine tuning of ControlFilter 
settings; removed no more used code.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761424 13f79535-47bb-0310-9956-ffa450edef68
2016-09-19 12:03:13 +00:00
Jacopo Cappellato 96b22285f4 Implemented: removed the "controller" related logic, that is now provided by the
new ControlFilter, from the ContextFilter; modified existing applications to use 
the two filters in a chain; removed from the other specialized filters all the 
logic that was duplicated or extended from ContextFilter.

A web application, in order to leverage the OFBiz framework, requires that a 
series of objects are in its contexts (servlet context, session and request) 
such as "delegator", "delegatorName", "dispatcher", "security" etc. etc...
This setup is performed by the logic contained in the servlet filter implemented 
by the ContextFilter class.
The execution of this logic is required for the application to run properly.
However, before this commit, in the ContextFilter there was other logic, related 
to access control and redirection rules (some of them performed in coordination 
with the ControlServlet), making it difficult to deploy this filter in all the 
web applications, especially the ones that implement special handling of paths.
In fact, this filter was deployed in most but not all the web application in the 
OFBiz codebase: specifically it was not deployed in web applications that 
require the execution of other filters (e.g. CatalogUrlFilter, etc...) like the 
ones in the "ecommerce" and "solr" components.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761304 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:08:30 +00:00
Pranay Pandey 22c44b3967 Implemented: Multisite support in specialpurpose/cmssite
(OFBIZ-7120)

Second patch for providing demo data for multisite feature.

Thanks Mohammed Rehan Khan for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761156 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 08:15:20 +00:00
Pranay Pandey ee473a8e2d Implemented: Multisite support in specialpurpose/cmssite
(OFBIZ-7120)

Adding missing files from last commit r1761150.

Thanks Mohammed Rehan Khan for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761155 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 08:12:25 +00:00
Pranay Pandey 652b2b988e Implemented: Multisite support in specialpurpose/cmssite
(OFBIZ-7120)

This is the first patch from the ticket and is for the implementation done to support the multisite feature in specialpurpose/cmssite component.

Thanks Mohammed Rehan Khan for the contribution.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761150 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 08:03:19 +00:00
Jacopo Cappellato d67f8ed8af Removed several jar files and a script that didn't seem to be used and were not mentioned in our LICENSE files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1759593 13f79535-47bb-0310-9956-ffa450edef68
2016-09-07 11:55:19 +00:00
Jacques Le Roux ddbea4ce13 This removes the pos component. OFBIZ-7804 "Check if we should fix or remove the POS (hence WebPos?)"
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.

I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
                <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
                <entity-count entity-name="InventoryItem" count-field="iiCount">
                    <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
                </entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
//                if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
//                    continue;
//                }

While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1754402 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 12:27:20 +00:00
Deepak Dixit 8f3141cd46 (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Deepak Dixit 3ac62d9fe8 (OFBIZ-1319) Replace selectall.js occurance with OfbizUtil.js.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752900 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 06:46:24 +00:00
Taher A. Alkhateeb 25ffc93eb5 Another major patch for OFBIZ-7534 replacing Ant with Gradle
This is the first patch that takes OFBiz to the point of no return
in terms of switching from Ant to Gradle build system. Specifically
this patch applies the following items:

- Delete all old Ant and Maven build scripts
- Delete 169 Jar libraries and replace them with remote ones in the
  gradle build script
- update the gradle build scripts for the dependencies and other minor
  changes needed for the script work correctly

All tests pass with the command ./gradlew cleanAll loadDefault testIntegration

Again, thank you for everyone who contributed valueble time and effort in this
process.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752033 13f79535-47bb-0310-9956-ffa450edef68
2016-07-09 18:10:19 +00:00
Jacques Le Roux 4deae05a38 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux a98ac13d9d Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux b20816bfa8 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Pranay Pandey 1438b0490a [OFBIZ-7132] Applied slightly modified patch from the ticket. Added WebSiteAlias usage example to cmssite data.
Thanks Chandan Khandelwal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748800 13f79535-47bb-0310-9956-ffa450edef68
2016-06-17 06:49:30 +00:00
Jacques Le Roux 10d1e72a53 A patch from Ankit Joshi for "http://docs.ofbiz.org/ is wrongly used in content" https://issues.apache.org/jira/browse/OFBIZ-7001
There are 31 occurrences and most use shortcuts. They should be converted to link to the current wiki, of course the previous shortcuts are no longer valid.
We need to replace them by hand, hence 1st find what the old shortcuts were, and then replace them with new shortcuts, or even better real links. We got bitten once by shortcuts, it's enough...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1748260 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 15:23:37 +00:00
Jacques Le Roux 289fc3f589 Implements "Use only HTTPS in OFBiz" - https://issues.apache.org/jira/browse/OFBIZ-6849
All tests passes and the normal use of OFBiz seems to work

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1745525 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 18:02:23 +00:00